Skip to content

Commit

Permalink
Removed Bintray reference from project (#1447)
Browse files Browse the repository at this point in the history
* Attempt to fix openssl key decryption

* Restore Xavier's key.

* Removed bintray execution from release script.

* Removed nopad flag from key decryption

* Set version in gradle publish DSL

* Removed bintray leftovers references.
  • Loading branch information
AlexandrouR authored Jul 12, 2021
1 parent fba8b11 commit 3468392
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 49 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
24 changes: 1 addition & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -36,7 +35,6 @@ ext {
description 'Web3j base project.'

[
'bintray',
'jacoco',
'java',
'javadoc',
Expand All @@ -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
}
Expand Down Expand Up @@ -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
}
20 changes: 0 additions & 20 deletions gradle/bintray/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion gradle/publish/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ publishing {

version = '4.8.5'


pom {
name = project.name
description.set(project.provider({ project.description }))
Expand Down

0 comments on commit 3468392

Please sign in to comment.