diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fcd531c..e72f50d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @conor10 @iikirilov \ No newline at end of file +* @conor10 @gtebrean @NickSneo \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9594b66..188a143 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,3 +7,8 @@ ### Why is it needed? *required* +## Checklist + +- [ ] I've read the contribution guidelines. +- [ ] I've added tests (if applicable). +- [ ] I've added a changelog entry if necessary. \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03ff393..6795a5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: Build on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index f8ccbfc..af3ad35 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -3,7 +3,7 @@ name: Publish snapshot on: workflow_run: workflows: [ 'Build' ] - branches: [ master ] + branches: [ main ] types: [ completed ] jobs: @@ -11,9 +11,10 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 @@ -29,8 +30,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Decrypt secret key - run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d - name: Publish snapshot run: ./gradlew publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1955247..16363cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,9 +7,10 @@ jobs: release: runs-on: ubuntu-latest env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_USERNAME: ${{ secrets.OSSRH_WEB3J_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 @@ -36,8 +37,6 @@ jobs: restore-keys: ${{ runner.os }}-gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Decrypt secret key - run: openssl aes-256-cbc -K ${{ secrets.GPG_KEY }} -iv ${{ secrets.GPG_IV }} -in web3j.asc.enc -out web3j.asc -d - name: Release name id: release_name uses: actions/github-script@v4 diff --git a/.gitignore b/.gitignore index 9c8bf10..876d13c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ docs/build # OS X .DS_Store -web3j.asc bin .classpath diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d15ce9..da5502a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -# [4.11.2]() (Upcoming) +# [4.11.3]() (Upcoming) ### Bug Fixes @@ -11,11 +11,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -* +* bump snapshot version to 4.11.3 [#104](https://github.com/hyperledger/web3j-evm/pull/104) ### BREAKING CHANGES -* +* Master branch rename to main and repo migration fixes [#106](https://github.com/hyperledger/web3j-evm/pull/106) # [4.11.2](https://github.com/web3j/web3j-evm/releases/tag/v4.11.2) (2024-03-27) @@ -25,7 +25,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features -* Web3J upgrade and Bump version [#104](https://github.com/web3j/web3j-evm/pull/104) +* Web3J upgrade and Bump version [#103](https://github.com/web3j/web3j-evm/pull/103) ### BREAKING CHANGES diff --git a/build.gradle b/build.gradle index 88ac314..0d05116 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ apply { 'junit' ].each { buildScript -> download { - src "https://raw.githubusercontent.com/web3j/build-tools/master/gradle/$buildScript/build.gradle" + src "https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/$buildScript/build.gradle" dest "$rootDir/gradle/$buildScript/build.gradle" overwrite false quiet true diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle index 9cc5f44..4d3ab52 100644 --- a/gradle/publish/build.gradle +++ b/gradle/publish/build.gradle @@ -48,9 +48,9 @@ publishing { slug = project.rootProjectOverride } - url = "https://github.com/web3j/$slug" - connection = "scm:https://github.com/web3j/${slug}.git" - developerConnection = "scm:git://github.com/web3j/${slug}.git" + url = "https://github.com/hyperledger/$slug" + connection = "scm:https://github.com/hyperledger/${slug}.git" + developerConnection = "scm:git://github.com/hyperledger/${slug}.git" } developers { @@ -84,8 +84,7 @@ nexusStaging { signing { sign publishing.publications.maven - def signingKey = new File("$rootDir/web3j.asc") - if (signingKey.exists()) { - useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE')) - } + def gpgSecretKey = System.getenv('OSSRH_GPG_SECRET_KEY') + def password = System.getenv('OSSRH_GPG_SECRET_KEY_PASSWORD') + useInMemoryPgpKeys(gpgSecretKey, password) } diff --git a/gradle/spotless/build.gradle b/gradle/spotless/build.gradle index 2edff87..3531176 100644 --- a/gradle/spotless/build.gradle +++ b/gradle/spotless/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.diffplug.gradle.spotless' apply plugin: "de.undercouch.download" task downloadJavaLicense(type: Download) { - src 'https://raw.githubusercontent.com/web3j/build-tools/master/gradle/spotless/java.license' + src 'https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/spotless/java.license' dest new File("$rootDir/gradle/spotless",'java.license') quiet true onlyIfModified true @@ -11,7 +11,7 @@ task downloadJavaLicense(type: Download) { task downloadFormatterProperties(type: Download) { - src 'https://raw.githubusercontent.com/web3j/build-tools/master/gradle/spotless/formatter.properties' + src 'https://raw.githubusercontent.com/hyperledger/web3j-build-tools/main/gradle/spotless/formatter.properties' dest new File("$rootDir/gradle/spotless",'formatter.properties') quiet true onlyIfModified true diff --git a/web3j.asc.enc b/web3j.asc.enc deleted file mode 100644 index 2bc247e..0000000 Binary files a/web3j.asc.enc and /dev/null differ