From 262c09f6d758bf6c3b1f56b079081589da3922a1 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Tue, 23 Sep 2025 21:51:42 +0200 Subject: [PATCH] Update Gradle Wrapper to 9.1.0 --- .github/workflows/cd.yml | 3 +-- .github/workflows/ci.yml | 4 +--- .github/workflows/codeql-analysis.yml | 5 +++++ .github/workflows/release.yml | 3 +-- build.gradle.kts | 7 ++++++- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 3 --- gradlew.bat | 3 +-- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a916644..7e19455 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -23,8 +23,7 @@ jobs: # - windows-latest # - macos-latest java: - - 8 - # - 17 + - '21' runs-on: ${{ matrix.os }} timeout-minutes: 20 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10ec993..27aceb8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,9 +25,7 @@ jobs: # pinned to macos-13 due to https://github.com/actions/runner-images/issues/9254 - macos-13 java: - - 8 - - 17 -# - 21 + - '21' runs-on: ${{ matrix.os }} timeout-minutes: 20 steps: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3861adc..1792834 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,6 +36,11 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v5 + - name: Set up JDK + uses: actions/setup-java@v5.0.0 + with: + distribution: 'zulu' + java-version: '21' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5429c99..158205b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,8 +25,7 @@ jobs: # - windows-latest # - macos-latest java: - - 8 - # - 17 + - '21' runs-on: ${{ matrix.os }} timeout-minutes: 20 steps: diff --git a/build.gradle.kts b/build.gradle.kts index 8923ee0..d7ed45b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("maven-publish") id("signing") id("com.github.ben-manes.versions") version "0.52.0" - id("net.ossindex.audit") version "0.4.11" + id("org.sonatype.gradle.plugins.scan") version "3.1.4" id("io.freefair.maven-central.validate-poms") version "8.14.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" } @@ -198,6 +198,11 @@ signing { sign(publishing.publications[publicationName]) } +ossIndexAudit { + username = System.getenv("SONATYPE_INDEX_USERNAME") ?: findProperty("sonatype.index.username") + password = System.getenv("SONATYPE_INDEX_PASSWORD") ?: findProperty("sonatype.index.password") +} + nexusPublishing { repositories { if (!isSnapshot) { diff --git a/gradle.properties b/gradle.properties index 3117091..65c3e58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,3 +14,6 @@ sonatype.staging.url=https://oss.sonatype.org/service/local/staging/deploy/maven sonatype.staging.profile.id= sonatype.username= sonatype.password= + +sonatype.index.username= +sonatype.index.password= diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3e781fb..6a38a8c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..adff685 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell