diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3d95da7..706d88d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,3 @@ -# GH_TOKEN # NEXUS_USER # NEXUS_PASS64 (base64 NOTE: `base64` and `openssl base64` failed, had to use Java # byte[] data = "{{password}}".getBytes(StandardCharsets.UTF_8); @@ -11,6 +10,8 @@ # GRADLE_SECRET name: deploy +permissions: + contents: write on: workflow_dispatch: inputs: @@ -27,7 +28,7 @@ jobs: runs-on: ubuntu-latest name: deploy env: - gh_token: ${{ secrets.GH_TOKEN }} + gh_token: ${{ secrets.GITHUB_TOKEN }} ORG_GRADLE_PROJECT_nexus_user: ${{ secrets.NEXUS_USER }} ORG_GRADLE_PROJECT_nexus_pass64: ${{ secrets.NEXUS_PASS64 }} ORG_GRADLE_PROJECT_gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} diff --git a/build.gradle b/build.gradle index d63ffcd..68b9876 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ ext.javadoc_agg='spotless-changelog-lib spotless-changelog-plugin-gradle' apply from: 干.file('base/sonatype.gradle') String VER_JUNIT = '4.13.2' -String VER_ASSERTJ = '3.24.2' -String VER_JGIT= '6.4.0.202211300538-r' +String VER_ASSERTJ = '3.26.0' +String VER_JGIT= '6.10.0.202406032230-r' subprojects { apply from: 干.file('base/java.gradle') diff --git a/settings.gradle b/settings.gradle index aeff27b..ed6e364 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,18 +8,18 @@ plugins { // https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md id 'com.diffplug.blowdryerSetup' version '1.7.1' // https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md - id 'com.diffplug.spotless' version '6.23.3' apply false + id 'com.diffplug.spotless' version '7.0.0.BETA1' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md id 'com.diffplug.spotless-changelog' version '3.0.2' apply false // https://plugins.gradle.org/plugin/com.gradle.plugin-publish id 'com.gradle.plugin-publish' version '1.2.1' apply false // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md - id 'dev.equo.ide' version '1.7.5' apply false + id 'dev.equo.ide' version '1.7.6' apply false // https://github.com/gradle-nexus/publish-plugin/releases - id 'io.github.gradle-nexus.publish-plugin' version '2.0.0-rc-1' apply false + id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false } blowdryerSetup { - github 'diffplug/blowdryer-diffplug', 'tag', '7.1.1' + github 'diffplug/blowdryer-diffplug', 'tag', '7.3.0' //devLocal '../blowdryer-diffplug' setPluginsBlockTo { it.file 'plugin.versions'