diff --git a/appmonet-sdk/appmonet-sdk-core/build.gradle b/appmonet-sdk/appmonet-sdk-core/build.gradle index a6a174f..ef92e1e 100644 --- a/appmonet-sdk/appmonet-sdk-core/build.gradle +++ b/appmonet-sdk/appmonet-sdk-core/build.gradle @@ -3,5 +3,6 @@ apply from: '../common-build.gradle' project.description = 'AppMonet Android SDK - Core' project.ext.projectTitle = 'AppMonet Android SDK - Core' project.ext.projectName = 'appmonet-core' - +project.ext.build = 'core' +project.ext.aarName = 'appmonet-sdk-core' apply from: '../publish.gradle' diff --git a/appmonet-sdk/appmonet-sdk-dfp/build.gradle b/appmonet-sdk/appmonet-sdk-dfp/build.gradle index 9bc38c6..084ebe2 100644 --- a/appmonet-sdk/appmonet-sdk-dfp/build.gradle +++ b/appmonet-sdk/appmonet-sdk-dfp/build.gradle @@ -8,5 +8,7 @@ dependencies { project.description = 'AppMonet Android SDK - Google' project.ext.projectTitle = 'AppMonet Android SDK - Google' project.ext.projectName = 'appmonet-dfp' +project.ext.build = 'dfp' +project.ext.aarName = 'appmonet-sdk-dfp' apply from: '../publish.gradle' \ No newline at end of file diff --git a/appmonet-sdk/appmonet-sdk-mopub/build.gradle b/appmonet-sdk/appmonet-sdk-mopub/build.gradle index 8ac7c9e..352daf1 100644 --- a/appmonet-sdk/appmonet-sdk-mopub/build.gradle +++ b/appmonet-sdk/appmonet-sdk-mopub/build.gradle @@ -11,5 +11,7 @@ dependencies { project.description = 'AppMonet Android SDK - MoPub' project.ext.projectTitle = 'AppMonet Android SDK - MoPub' project.ext.projectName = 'appmonet-mopub' +project.ext.build = 'mopub' +project.ext.aarName = 'appmonet-sdk-mopub' apply from: '../publish.gradle' diff --git a/appmonet-sdk/publish.gradle b/appmonet-sdk/publish.gradle index d04f62e..1d15f00 100644 --- a/appmonet-sdk/publish.gradle +++ b/appmonet-sdk/publish.gradle @@ -1,57 +1,40 @@ -apply plugin: 'com.novoda.bintray-release' +apply plugin: 'maven-publish' Properties properties = new Properties() properties.load(project.rootProject.file('local.properties').newDataInputStream()) -def url = 'https://github.com/AppMonet/android-sdk' -def bintrayRepository = project.hasProperty('env') ? "MonetBidder" : "monet_android_dev" - -def apiKey = properties.getProperty("bintray.apiKey", "") -def user = properties.getProperty("bintray.user", "") - -tasks.withType(Javadoc).all { - enabled = false -} - -android.libraryVariants.all { variant -> - def name = variant.buildType.name - def task = project.tasks.create "jar${name.capitalize()}", Jar - - task.dependsOn variant.javaCompile - task.from variant.javaCompile.destinationDir - artifacts.add('archives', task) +task sourceJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier "sources" } -android.libraryVariants.all { variant -> - task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { - title = project.ext.projectTitle - description "Generates Javadoc for $variant.name." - source = variant.javaCompile.source - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile - - options { - links "https://docs.oracle.com/javase/8/docs/api/" - linksOffline "https://developer.android.com/reference", - "${android.sdkDirectory}/docs/reference" +publishing { + repositories { + maven { + name = "GithubPackages" + url = uri("https://maven.pkg.github.com/AppMonet/appmonet-android-sdk") + credentials { + username = System.getenv('GITHUB_USER') ?: properties['GITHUB_USER'] + password = System.getenv('GITHUB_PERSONAL_ACCESS_TOKEN') ?: properties['GITHUB_PERSONAL_ACCESS_TOKEN'] + } + } } - - exclude '**/BuildConfig.java' - exclude '**/R.java' - } -} - -publish { - repoName = bintrayRepository - userOrg = "appmonet" - groupId = project.group - artifactId = project.ext.projectName - uploadName = "monetbidder" - publishVersion = project.version - desc = project.description - website = url - repository = url - dryRun = false - bintrayUser = user - bintrayKey = apiKey -} + publications { + "${project.ext.build}Release"(MavenPublication) { + groupId project.group + artifactId project.ext.projectName + version project.version + artifact("$buildDir/outputs/aar/${project.ext.aarName}-release.aar") + artifact(sourceJar) + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + configurations.api.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 781488e..ae8bfb0 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.6.4' - classpath 'com.novoda:bintray-release:0.9.2' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.3' if (standaloneEnabled()) { classpath 'com.monet.groovy.plugins:dropbox:0.0.1'