build: bintrayPublish will not run on it's own

web3j · Sep 20, 2019 · 0f8a995 · 0f8a995
1 parent 9e81d25
commit 0f8a995
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 48 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ release-snapshot:
     OSSRH_REPO_URL: $SNAPSHOT_OSSRH_REPO_URL
   stage: release
   script:
-  - ./gradlew release -x build
+  - ./gradlew uploadArchives -x build
   only:
     refs:
       - master
@@ -57,7 +57,7 @@ release-version:
   stage: release
   script:
   - sed -i "47s/.*/    web3jVersion = '${CI_COMMIT_REF_NAME//release\/}'/" build.gradle
-  - ./gradlew -Pversion=${CI_COMMIT_REF_NAME//release\/} bintrayUpload -x bintrayPublish
+  - ./gradlew -Pversion=${CI_COMMIT_REF_NAME//release\/} bintrayUpload bintrayPublish
   only:
     refs:
       - /^release\/(\d*).(\d*).(\d*)/
@@ -68,7 +68,6 @@ publish-version:
     OSSRH_REPO_URL: $RELEASE_OSSRH_REPO_URL
   stage: publish
   script:
-    - ./gradlew -Pversion=${CI_COMMIT_REF_NAME//release\/} bintrayPublish
     - ./gradlew -Pversion=${CI_COMMIT_REF_NAME//release\/} githubRelease
   only:
     refs:

diff --git a/build.gradle b/build.gradle
@@ -225,51 +225,6 @@ bintray {
     }
 }
 
-task release {
-    dependsOn 'build'
-    dependsOn 'uploadArchives'
-
-    doLast {
-        // Validates the user inputs before a release can be performed.
-        if (isSnapshotVersion) {
-            // Only need OSSRH details.
-            logger.lifecycle("About to perform {} snapshot release ...", manualRelease ? "a manual" : "an automated")
-
-            if (!ossrhUsername || !ossrhPassword || !ossrhRepoUrl) {
-                throw new InvalidUserDataException("Required parameters missing:  'ossrhUsername', 'ossrhPassword', 'ossrhRepoUrl'")
-            }
-
-            logger.lifecycle(" - ossrhUsername={}", ossrhUsername)
-            logger.lifecycle(" - ossrhPassword={}", ossrhPassword ? "provided" : "not_provided")
-            logger.lifecycle(" - ossrhRepoUrl={}", ossrhRepoUrl)
-        } else {
-            // Release => Need OSSRH and bintray.
-            if (!ossrhUsername || !ossrhPassword || !ossrhRepoUrl) {
-                throw new InvalidUserDataException("Required parameters missing:  'ossrhUsername', 'ossrhPassword', 'ossrhRepoUrl'")
-            }
-            if (!bintrayUser || !bintrayKey || !bintrayGpgPassphrase) {
-                throw new InvalidUserDataException("Required parameters missing:  'bintrayUser', 'bintrayKey', 'bintrayGpgPassphrase'")
-            }
-            logger.lifecycle("About to perform {} full release ...", manualRelease ? "a manual" : "an automated")
-            logger.lifecycle(" - ossrhUsername={}", ossrhUsername)
-            logger.lifecycle(" - ossrhPassword={}", ossrhPassword ? "provided" : "not_provided")
-            logger.lifecycle(" - ossrhRepoUrl={}", ossrhRepoUrl)
-            logger.lifecycle(" - bintrayUser={}", bintrayUser)
-            logger.lifecycle(" - bintrayKey={}", bintrayKey ? "provided" : "not_provided")
-            logger.lifecycle(" - bintrayGpgPassphrase={}", bintrayGpgPassphrase ? "provided" : "not_provided")
-        }
-    }
-
-    // Snapshots go to nexus, non-snapshots go to bintray.
-    if (isSnapshotVersion) {
-        dependsOn 'uploadArchives'
-        tasks.findByName('uploadArchives').mustRunAfter 'build'
-    } else {
-        dependsOn 'bintrayUpload'
-        tasks.findByName('bintrayUpload').mustRunAfter 'build'
-    }
-}
-
 compileKotlin {
     kotlinOptions {
         jvmTarget = "1.8"