diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 5a75c3b7b..01082da62 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -14,8 +14,6 @@ jobs: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - BINTRAY_USER: ${{ secrets.BINTRAY_USER }} - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd2a7aed0..3e20c8b3f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,8 +14,6 @@ jobs: OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - BINTRAY_USER: ${{ secrets.BINTRAY_USER }} - BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 @@ -40,7 +38,7 @@ jobs: value: $GITHUB_REF start: 8 # Remove 'release/' prefix - name: Build and stage release - run: ./gradlew publish + run: ./gradlew publish -Pversion=${{ steps.release_name.outputs.result }} - name: Release run: ./gradlew closeAndReleaseRepository - name: GitHub release diff --git a/build.gradle b/build.gradle index 302e2912e..a0f6c795c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ plugins { id 'io.codearte.nexus-staging' version '0.22.0' id 'de.marcphilipp.nexus-publish' version '0.4.0' id 'de.undercouch.download' version '4.1.1' - id 'com.jfrog.bintray' version '1.8.5' id 'org.ajoberstar.git-publish' version '3.0.0' } @@ -36,7 +35,6 @@ ext { description 'Web3j base project.' [ - 'bintray', 'jacoco', 'java', 'javadoc', @@ -47,7 +45,7 @@ description 'Web3j base project.' download { src "https://raw.githubusercontent.com/web3j/build-tools/master/gradle/$buildScript/build.gradle" dest "$rootDir/gradle/$buildScript/build.gradle" - overwrite true + overwrite false quiet true onlyIfModified true } @@ -89,30 +87,10 @@ allprojects { } } - publishing { - publications { - maven(MavenPublication) { - version = '4.8.5' - pom { - scm { - url = "https://github.com/web3j/web3j" - connection = "scm:https://github.com/web3j/web3j.git" - developerConnection = "scm:git://github.com/web3j/web3j.git" - } - } - } - } - } - if (project.name != 'integration-tests' && project.name != 'web3j') { apply from: "$rootDir/gradle/publish/build.gradle" - apply from: "$rootDir/gradle/bintray/build.gradle" } } configure(subprojects.findAll { it.name != 'integration-tests' }) { apply from: "$rootDir/gradle/jacoco/build.gradle" } - -bintrayUpload { - enabled = false -} diff --git a/gradle/bintray/build.gradle b/gradle/bintray/build.gradle deleted file mode 100644 index 5984b8c94..000000000 --- a/gradle/bintray/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -apply plugin: 'com.jfrog.bintray' - -bintray { - user = System.getenv('BINTRAY_USER') - key = System.getenv('BINTRAY_KEY') - def slug = rootProject.name - if (project.hasProperty('rootProjectOverride')) { - slug = project.rootProjectOverride - } - publications = ['maven'] - publish = true - override = true - pkg { - repo = 'maven' - name = slug - userOrg = 'web3j' - licenses = ['Apache-2.0'] - publicDownloadNumbers = true - } -} diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle index 790fdc3e8..126933f89 100644 --- a/gradle/publish/build.gradle +++ b/gradle/publish/build.gradle @@ -32,7 +32,6 @@ publishing { version = '4.8.5' - pom { name = project.name description.set(project.provider({ project.description }))