diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3d95da7..22a6607 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); @@ -27,7 +26,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/settings.gradle b/settings.gradle index be359d1..288ea4c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,11 +8,13 @@ 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 '7.0.3' apply false + id 'com.diffplug.spotless' version '7.2.1' apply false // https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md id 'com.diffplug.spotless-changelog' version '3.1.2' apply false // https://plugins.gradle.org/plugin/com.gradle.plugin-publish id 'com.gradle.plugin-publish' version '1.3.1' apply false + // https://plugins.gradle.org/plugin/com.gradle.develocity + id 'com.gradle.develocity' version '4.1.1' // https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md id 'dev.equo.ide' version '1.7.8' apply false // https://github.com/gradle-nexus/publish-plugin/releases @@ -20,9 +22,10 @@ plugins { } rootProject.name = 'blowdryer' blowdryerSetup { - github 'diffplug/blowdryer-diffplug', 'tag', '9.0.0' + github 'diffplug/blowdryer-diffplug', 'tag', '9.1.0' //devLocal '../blowdryer-diffplug' setPluginsBlockTo { it.file 'plugin.versions' } -} \ No newline at end of file +} +apply from: com.diffplug.blowdryer.Blowdryer.file('base/buildscan-on-ci.gradle')