Allow publishing of Snapshots to Sonatype OSS

Author: Marcel Schnelle

.idea/runConfigurations/Publish_Release.xml

@@ -4,6 +4,8 @@ env:
   global:
   - bintrayUser=aurae
   - secure: VoY/zWE7itJmukAZt1Zw43jFzOk2ssWbpWhydYLiaRvplYVJvXTCSve4ZDpBhxPAlta2Kpfr9H8bwuaYCEtS+ovhi/q8Fo97YXiGdkHwEXJPal2n4O/XEj5hFr1BxIDTEwFBtGD/iQWZL/MVRaWFrfuMWajMZhDQkGz+DwRog4XCaw6UcEofW9kzfPG1T94C/bAIETrad4bfHKSbORVd2SbyPCFHkFH+YB/eWVqK2N5PuiPaet+EzcX/sxAFnwD6kF/uj3KxTlii/Yw8bM6LrPEWyyuMDglHN3LTevZ1CwT1oy8AUZaFzx246SL+Osn6t9WHoL1p3ltTS9O7sNL6WSyCP+JFYXF8iaF9USaINy/vcZFPsKdcCpgLPjSF/4mgXcjPc5KRao3tZOoamyvXuiGg7lfwUBl82t73ItlnSGgInAyUSesVrQ2gJNsVHdRqvOmVPBGXZ3lWb4GHksfQzLO210M7Tiu6leacWEbsYWmAsRER87qdUu7lY2b3wYJB7NhXX5AMZYINSzfCDVrThTWLXUU554D/3TmTKz/ROab2QxR/Qxh5i4ZJ/0MNdcM+qp8ORq6WlwGTUhCmD83XtiuBF3s/JW1WybsqC4Ppo23YuItqgfmMZWk75xLqpi48078vNgtEE/1YE2tvxd7ddfeT3eNLt7qrfj7Hu+r3L5A=
+  - sonatypeUser=aurae
+  - secure: C6eYUpK0VYvnJ7FGvGP+2EhqHvUxLAslY6rgjewUihagWxh4Yn8pY2jeDEXvuQHoErkyhOSyEHvUqfzdVa+SuQdo1Ldn9Pzm90wvatWAyQCIkrg9bCyqYgz1Fx2GpwJJCyrqOQVpeR8aYFi0gUh+YbsHiiquwvIMLxpNmtVLYnauDsLcy36nEsixWWAJBPRBchwW3+hukv2ZjvS8VVktxWa1WhknAlVSxDaYhgMRBFbOXZcneP4I2VOYIz4zKAS1tqXF72EEQf74+1Zray/DSbm+LFvLy0eiq3JptxLVk2w5DV3BzeQKQLW0vr2tULzOO8XnTJcwiBHHzMGeSCjRgLDqj6D4wbXAh8YDWVfTHkjWYMMGfSXpS6TWkJhtg3nsmqa7LcH3uyZHxhTrJF4JTjmNlF4XaXrTOZVlAhKgfojMqlEexFW/C1RZxoMry/K5d1N/Pm4/ayFyNHHQ6wpMxXsO8IWEGIU5mkVigpq+9UIhN/HtH6tZ+1UQKsE7bcAfoQcDnrBoeDxAHNetkkueSRt3GpaVMlil2+EzgdBkl6c3ns5GV06m9e9Y4JRW05M+q38o9NV/pbUaljIJ8WPHtIfbGw8L8jwrka/HtI6+7z8ev61Ot/A8DNEmoZb/kUtk2KgD0E5aQYBaQzhxy9EImQiIM5UY6qrcNuqjnZBf3qk=
 
 android:
   components:
@@ -16,7 +18,7 @@ jdk:
 - oraclejdk8
 
 before_install:
-  - echo "sdk.dir=$ANDROID_HOME" > local.properties
+- echo "sdk.dir=$ANDROID_HOME" > local.properties
 
 script: ./gradlew clean check --info --stacktrace
 

.idea/runConfigurations/Publish_Snapshot.xml

@@ -3,7 +3,6 @@ apply plugin: "idea"
 apply plugin: "maven"
 apply plugin: "maven-publish"
 apply plugin: "com.jfrog.bintray"
-apply plugin: "com.jfrog.artifactory"
 
 sourceCompatibility = JavaVersion.VERSION_1_6
 targetCompatibility = JavaVersion.VERSION_1_6
@@ -90,7 +89,7 @@ dependencies {
 // ------------------------------------------------------------------------------------------------
 // Deployment Setup
 //
-// Releases are pushed to jcenter via Bintray, and snapshots are pushed to OJO Artifactory.
+// Releases are pushed to jcenter via Bintray, while snapshots are pushed to Sonatype OSS.
 // This section defines the necessary tasks to push new releases and snapshots using Gradle tasks.
 // ------------------------------------------------------------------------------------------------
 
@@ -141,40 +140,42 @@ task copyPom(type: Copy) {
 
 publish.dependsOn copyPom
 
-// Configure deployment of release versions to Bintray
-bintray {
-    user = project.ext.bintrayUser
-    key = project.ext.bintrayKey
-    configurations = ["archives"]
-    dryRun = false
-    pkg {
-        repo = "maven"
-        name = ARTIFACT_ID
-        userOrg = project.ext.bintrayUser
-        licenses = ["EPL-1.0"]
-        publish = true
-        publicDownloadNumbers = true
-        vcsUrl = VCS_URL
-        version {
-            name = VERSION_NAME
-            desc = DESCRIPTION
+project.configure(project) {
+    if (project.version.endsWith("-SNAPSHOT")) {
+        // Configure deployment of snapshot versions to Sonatype OSS
+        project.publishing {
+            repositories {
+                maven {
+                    name "snapshot"
+                    credentials {
+                        username project.ext.sonatypeUser
+                        password project.ext.sonatypePass
+                    }
+                    url "https://oss.sonatype.org/content/repositories/snapshots"
+                }
+            }
         }
-    }
-}
 
-// Configure deployment of snapshots to Artifactory
-artifactory {
-    contextUrl = "https://oss.jfrog.org/artifactory"
-    publish {
-        repository {
-            repoKey = VERSION_NAME.endsWith("SNAPSHOT") ? "oss-snapshot-local" : "oss-release-local"
-            username = project.ext.bintrayUser
-            password = project.ext.bintrayKey
-            maven = true
-        }
-        defaults {
-            publishArtifacts = true
-            publications("library")
+    } else {
+        // Configure deployment of release versions to Bintray
+        project.bintray {
+            user = project.ext.bintrayUser
+            key = project.ext.bintrayKey
+            configurations = ["archives"]
+            dryRun = false
+            pkg {
+                repo = "maven"
+                name = ARTIFACT_ID
+                userOrg = project.ext.bintrayUser
+                licenses = ["EPL-1.0"]
+                publish = true
+                publicDownloadNumbers = true
+                vcsUrl = VCS_URL
+                version {
+                    name = VERSION_NAME
+                    desc = DESCRIPTION
+                }
+            }
         }
     }
 }

.travis.yml

@@ -2,39 +2,45 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$BINTRAY_PLUGIN_VERSION"
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$JFROG_PLUGIN_VERSION"
     }
 }
 
 // Populate deployment credentials:
 // * Local development - stored in properties file
 // * CI Server - stored in environment variables
-def deploymentUser = ""
-def deploymentPass = ""
+def bintrayUser = ""
+def bintrayKey = ""
+def sonatypeUser = ""
+def sonatypePass = ""
 
 def credentialsFile = new File(project.rootDir, "local.properties")
 if (credentialsFile.exists()) {
     Properties properties = new Properties()
     credentialsFile.withReader { properties.load(it) }
-    deploymentUser = properties.get("BINTRAY_USER")
-    deploymentPass = properties.get("BINTRAY_API_KEY")
+    bintrayUser = properties.get("BINTRAY_USER")
+    bintrayKey = properties.get("BINTRAY_KEY")
+    sonatypeUser = properties.get("SONATYPE_USER")
+    sonatypePass = properties.get("SONATYPE_PASS")
 
 } else {
-    deploymentUser = System.getenv("bintrayUser")
-    deploymentPass = System.getenv("bintrayKey")
+    bintrayUser = System.getenv("bintrayUser")
+    bintrayKey = System.getenv("bintrayKey")
+    sonatypeUser = System.getenv("sonatypeUser")
+    sonatypePass = System.getenv("sonatypePass")
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
     }
-    ext {
-        bintrayUser = deploymentUser
-        bintrayKey = deploymentPass
-    }
+
+    // Store deployment credentials
+    ext.bintrayUser = bintrayUser
+    ext.bintrayKey = bintrayKey
+    ext.sonatypeUser = sonatypeUser
+    ext.sonatypePass = sonatypePass
 }

android-junit5/build.gradle

@@ -10,8 +10,7 @@ VCS_URL                   = https://github.com/aurae/android-junit5
 # Dependency versions (plugins)
 ANDROID_PLUGIN_VERSION_2X = 2.3.2
 ANDROID_PLUGIN_VERSION_3X = 3.0.0-alpha5
-BINTRAY_PLUGIN_VERSION    = 1.3.1
-JFROG_PLUGIN_VERSION      = 4.1.1
+BINTRAY_PLUGIN_VERSION    = 1.7.3
 
 # Dependency versions
 SEMVER_VERSION            = 0.9.0

build.gradle

@@ -1,4 +1,9 @@
 #!/bin/bash
+#
+# Deploy a jar, source jar, and javadoc jar to Sonatype's snapshot repo.
+#
+# Adapted from https://coderwall.com/p/9b_lfq and
+# http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
 
 SLUG="aurae/android-junit5"
 JDK="oraclejdk8"
@@ -16,6 +21,6 @@ elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then
   echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'."
 else
   echo "Deploying snapshot..."
-  ./gradlew artifactoryPublish
+  ./gradlew publishLibraryPublicationToSnapshotRepository
   echo "Snapshot deployed!"
 fi