Update versions for 7.5 (#404)

Updates ProGuardCORE + other required dependencies for Kotlin 2 + Java 22; including running tests with Java 22.

README.md

@@ -109,7 +109,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.4.2'
+        classpath 'com.guardsquare:proguard-gradle:7.5.0'
     }
 }
 ```

base/build.gradle

@@ -4,7 +4,6 @@ plugins {
     id 'maven-publish'
     id "org.jetbrains.kotlin.jvm" version "$kotlinVersion"
     id 'com.adarshr.test-logger' version '3.0.0'
-    id 'de.jansauer.printcoverage' version '2.0.0'
     id 'jacoco'
     id "org.jlleitschuh.gradle.ktlint" version '10.2.1'
 }
@@ -24,15 +23,15 @@ dependencies {
     implementation "com.google.code.gson:gson:${gsonVersion}"
     implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
     implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    implementation 'org.json:json:20220924'
+    implementation 'org.json:json:20231013'
 
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-    testImplementation 'dev.zacsweers.kctfork:core:0.2.1'
-    testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.5.4' // for kotest framework
-    testImplementation 'io.kotest:kotest-assertions-core-jvm:5.5.4' // for kotest core jvm assertions
-    testImplementation 'io.kotest:kotest-property-jvm:5.5.4' // for kotest property test
-    testImplementation 'io.mockk:mockk:1.13.2' // for mocking
+    testImplementation 'dev.zacsweers.kctfork:core:0.5.0-alpha07'
+    testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0' // for kotest framework
+    testImplementation 'io.kotest:kotest-assertions-core-jvm:5.9.0' // for kotest core jvm assertions
+    testImplementation 'io.kotest:kotest-property-jvm:5.9.0' // for kotest property test
+    testImplementation 'io.mockk:mockk:1.13.11' // for mocking
 
     testImplementation(testFixtures("com.guardsquare:proguard-core:${proguardCoreVersion}")) {
         exclude group: 'com.guardsquare', module: 'proguard-core'
@@ -50,7 +49,7 @@ jar {
 // Early access automatic downloads are not yet supported:
 // https://github.com/gradle/gradle/issues/14814
 // But it will work if e.g. Java N-ea is pre-installed
-def javaVersionsForTest = 9..21
+def javaVersionsForTest = 9..22
 
 test {
     useJUnitPlatform()
@@ -64,8 +63,8 @@ task testAllJavaVersions() { testAllTask ->
             useJUnitPlatform()
             ignoreFailures = true
 
-            // The version of bytebuddy used by mockk only supports Java 20 experimentally so far
-            if (version >= 20) systemProperty 'net.bytebuddy.experimental', true
+            // The version of bytebuddy used by mockk only supports Java 22 experimentally so far
+            if (version >= 22) systemProperty 'net.bytebuddy.experimental', true
 
             testAllTask.dependsOn(it)
 
@@ -86,9 +85,11 @@ jacocoTestReport {
     classDirectories.setFrom(classes)
     executionData.setFrom project.fileTree(dir: '.', include: '**/build/jacoco/*.exec')
     reports {
-        xml.enabled true
-        csv.enabled false
-        html.destination file("${buildDir}/reports/coverage")
+        xml.required = true
+        csv.required = false
+    }
+    javaVersionsForTest.each { version ->
+        mustRunAfter "testJava$version"
     }
 }
 

docs/md/manual/home.md

@@ -1,4 +1,4 @@
-Welcome to the manual for **ProGuard** version 7.4 ([what's new?](releasenotes.md)).
+Welcome to the manual for **ProGuard** version 7.5 ([what's new?](releasenotes.md)).
 
 ProGuard is an open-sourced Java class file shrinker, optimizer, obfuscator, and
 preverifier. As a result, ProGuard processed applications and libraries are smaller and faster.

docs/md/manual/releasenotes.md

@@ -1,4 +1,4 @@
-## Version 7.5.0-beta01
+## Version 7.5.0
 
 ### Kotlin support
 

examples/application-kotlin/build.gradle

@@ -7,12 +7,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.4.2'
+        classpath 'com.guardsquare:proguard-gradle:7.5.0'
     }
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.8.0'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0'
     id 'application'
 }
 

examples/application/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.4.2'
+        classpath 'com.guardsquare:proguard-gradle:7.5.0'
     }
 }
 
@@ -33,6 +33,12 @@ dependencies {
 
 ext.baseCoordinates = "${project.name}-${project.version}"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(22)
+    }
+}
+
 tasks.register('proguard', ProGuardTask) {
     configuration file('proguard.pro')
 

examples/application/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

examples/application/gradlew

@@ -205,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

examples/application/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

examples/gradle-kotlin-dsl/build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("com.guardsquare:proguard-gradle:7.4.0")
+        classpath("com.guardsquare:proguard-gradle:7.5.0")
     }
 }
 

examples/spring-boot/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.4.2'
+        classpath 'com.guardsquare:proguard-gradle:7.5.0'
     }
 }
 

gradle-plugin/build.gradle

@@ -48,11 +48,12 @@ dependencies {
         exclude module: 'proguard-gradle'
         exclude module: 'proguard-base'
     }
-    testImplementation 'io.kotest:kotest-runner-junit5-jvm:4.6.0'   // for kotest framework
-    testImplementation 'io.kotest:kotest-assertions-core-jvm:4.6.0' // for kotest core jvm assertions
-    testImplementation 'io.kotest:kotest-property-jvm:4.6.0'        // for kotest property test
 
-    testImplementation "io.mockk:mockk:1.12.0"
+    testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.0' // for kotest framework
+    testImplementation 'io.kotest:kotest-assertions-core-jvm:5.9.0' // for kotest core jvm assertions
+    testImplementation 'io.kotest:kotest-property-jvm:5.9.0' // for kotest property test
+    testImplementation 'io.mockk:mockk:1.13.11' // for mocking
+
     testImplementation "commons-io:commons-io:2.8.0"
 
     fatJar project(":base")

gradle-plugin/src/test/kotlin/proguard/gradle/GradlePluginIntegrationTest.kt

@@ -46,6 +46,7 @@ class GradlePluginIntegrationTest : FreeSpec({
                 .forwardOutput()
                 .withArguments("proguard")
                 .withPluginClasspath()
+                .withGradleVersion("7.4")
                 .withProjectDir(projectRoot)
                 .build()
 
@@ -91,6 +92,7 @@ fun testConfigOption(task: String) = funSpec {
             GradleRunner.create()
                     .forwardOutput()
                     .withArguments(tasks.asList())
+                    .withGradleVersion("7.4")
                     .withPluginClasspath()
                     .withProjectDir(projectRoot)
                     .build()

gradle-plugin/src/test/kotlin/proguard/gradle/ProguardCacheRelocateabilityIntegrationTest.kt

@@ -49,13 +49,15 @@ class ProguardCacheRelocateabilityIntegrationTest : FreeSpec({
         GradleRunner.create()
             .forwardOutput()
             .withArguments("proguard", "--build-cache")
+            .withGradleVersion("7.4")
             .withPluginClasspath()
             .withProjectDir(originalDir)
             .build()
 
         val result2 = GradleRunner.create()
             .forwardOutput()
             .withArguments("proguard", "--build-cache")
+            .withGradleVersion("7.4")
             .withPluginClasspath()
             .withProjectDir(relocatedDir)
             .build()

gradle.properties

@@ -1,9 +1,9 @@
-proguardVersion = 7.5.0-beta01
+proguardVersion = 7.5.0
 
 # The version of ProGuardCORE that sub-projects are built with
-proguardCoreVersion = 9.1.3
+proguardCoreVersion = 9.1.4
 gsonVersion = 2.9.0
-kotlinVersion = 2.0.0-RC2
+kotlinVersion = 2.0.0
 target = 1.8
 
 # Optionally compile the WTK plugin.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists