Upgrade Gradle, upgrade dependencies

.gitignore

@@ -5,3 +5,4 @@ build
 /docs/md/api/
 /docs/html/
 /venv/
+.kotlin/sessions/

android/build.gradle

@@ -14,20 +14,20 @@ dependencies {
 	api project(":proguard-core")
 	implementation 'com.android.tools:r8:3.3.75'
 
-	implementation 'org.jetbrains:annotations:24.0.0'
+	implementation 'org.jetbrains:annotations:26.0.1'
 
 	testImplementation(testFixtures(project(":proguard-core")))
 	testFixturesImplementation(testFixtures(project(":proguard-core")))
 
 	testImplementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
 	testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
-	testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.7.2' // for kotest framework
-	testImplementation 'io.kotest:kotest-assertions-core-jvm:5.7.2' // for kotest core jvm assertions
-	testImplementation 'io.kotest:kotest-property-jvm:5.7.2' // for kotest property test
-	testImplementation 'io.kotest:kotest-framework-datatest:5.7.2'
-	testImplementation 'io.mockk:mockk:1.13.12' // for mocking
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3' // for junit framework
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3' // for junit framework
+	testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.1' // for kotest framework
+	testImplementation 'io.kotest:kotest-assertions-core-jvm:5.9.1' // for kotest core jvm assertions
+	testImplementation 'io.kotest:kotest-property-jvm:5.9.1' // for kotest property test
+	testImplementation 'io.kotest:kotest-framework-datatest:5.9.1'
+	testImplementation 'io.mockk:mockk:1.13.13' // for mocking
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3' // for junit framework
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3' // for junit framework
 
 	testFixturesImplementation 'org.smali:smali:2.5.2'
 }

base/build.gradle

@@ -16,25 +16,25 @@ dependencies {
 	api "org.jetbrains.kotlin:kotlin-metadata-jvm:${kotlinVersion}"
 
 
-	implementation 'org.jetbrains:annotations:24.0.0'
+	implementation 'org.jetbrains:annotations:26.0.1'
 
-	implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
-	implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
+	implementation 'org.apache.logging.log4j:log4j-api:2.24.2'
+	implementation 'org.apache.logging.log4j:log4j-core:2.24.2'
 
 	testImplementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}"
 	testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
 	testFixturesImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
-	testFixturesImplementation group: "dev.zacsweers.kctfork", name: "core", version: "0.5.0"
-	testFixturesImplementation 'io.kotest:kotest-runner-junit5-jvm:5.7.2' // for kotest framework
-	testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.7.2' // for kotest framework
-	testImplementation 'io.kotest:kotest-assertions-core-jvm:5.7.2' // for kotest core jvm assertions
-	testFixturesImplementation 'io.kotest:kotest-assertions-core-jvm:5.7.2' // for kotest core jvm assertions
-
-	testImplementation 'io.kotest:kotest-property-jvm:5.7.2' // for kotest property test
-	testImplementation 'io.kotest:kotest-framework-datatest:5.7.2'
-	testImplementation 'io.mockk:mockk:1.13.12' // for mocking
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.0' // for junit framework
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.0' // for junit framework
+	testFixturesImplementation group: "dev.zacsweers.kctfork", name: "core", version: "0.7.0"
+	testFixturesImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.1' // for kotest framework
+	testImplementation 'io.kotest:kotest-runner-junit5-jvm:5.9.1' // for kotest framework
+	testImplementation 'io.kotest:kotest-assertions-core-jvm:5.9.1' // for kotest core jvm assertions
+	testFixturesImplementation 'io.kotest:kotest-assertions-core-jvm:5.9.1' // for kotest core jvm assertions
+
+	testImplementation 'io.kotest:kotest-property-jvm:5.9.1' // for kotest property test
+	testImplementation 'io.kotest:kotest-framework-datatest:5.9.1'
+	testImplementation 'io.mockk:mockk:1.13.13' // for mocking
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3' // for junit framework
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3' // for junit framework
 
 	testFixturesImplementation("com.guardsquare:proguard-assembler:1.0.0")
 }

base/src/main/java/proguard/classfile/io/LibraryClassReader.java

@@ -641,7 +641,7 @@ public void visitClassElementValue(
     @Override
     public void visitAnnotationElementValue(
         Clazz clazz, Annotation annotation, AnnotationElementValue annotationElementValue) {
-      skipAnnotationRemainingBytes(/* readTypeIndex = */ true, clazz, new Annotation());
+      skipAnnotationRemainingBytes(/* readTypeIndex= */ true, clazz, new Annotation());
     }
 
     @Override

base/src/main/java/proguard/evaluation/value/ReflectiveMethodCallUtil.java

@@ -177,8 +177,11 @@ public static Class<?> getClassForPrimitive(char internalPrimitiveType) {
   /** Reflectively call the constructor of className with the given parameters. */
   public static Object callConstructor(
       String className, Class<?>[] parameterClasses, Object[] parameterObjects)
-      throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException,
-          InvocationTargetException, InstantiationException {
+      throws ClassNotFoundException,
+          NoSuchMethodException,
+          IllegalAccessException,
+          InvocationTargetException,
+          InstantiationException {
     Class<?> baseClass = Class.forName(className);
     Constructor<?> constructor = baseClass.getConstructor(parameterClasses);
     return constructor.newInstance(parameterObjects);
@@ -193,7 +196,9 @@ public static Object callMethod(
       Object instance,
       Class<?>[] parameterClasses,
       Object[] parameterObjects)
-      throws InvocationTargetException, IllegalAccessException, NoSuchMethodException,
+      throws InvocationTargetException,
+          IllegalAccessException,
+          NoSuchMethodException,
           ClassNotFoundException {
     Class<?> baseClass = Class.forName(className);
     Method method = baseClass.getMethod(methodName, parameterClasses);

build.gradle

@@ -5,10 +5,10 @@ plugins {
 	id 'io.github.gradle-nexus.publish-plugin'
 	id 'signing'
 	id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
-	id 'com.adarshr.test-logger' version '3.0.0' apply false
-	id "org.sonarqube" version "3.4.0.2513"
-	id "io.freefair.aggregate-javadoc" version "8.10"
-	id "com.diffplug.spotless" version "6.13.0" apply false
+	id 'com.adarshr.test-logger' version '4.0.0' apply false
+	id "org.sonarqube" version "6.0.1.5171"
+	id "io.freefair.aggregate-javadoc" version "8.11"
+	id "com.diffplug.spotless" version "6.18.0" apply false
 }
 
 allprojects {

examples/src/main/java/proguard/examples/instrument/DebugStackTop.java

@@ -23,7 +23,10 @@
  */
 public class DebugStackTop {
   public static void main(String[] args)
-      throws IOException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+      throws IOException,
+          ClassNotFoundException,
+          NoSuchMethodException,
+          InvocationTargetException,
           IllegalAccessException {
     // Load the example class into a ClassPool.
     // The example has a method "foo(String)" which

examples/src/main/java/proguard/examples/modify/ReplaceSimpleConstantInstruction.java

@@ -26,7 +26,9 @@ public class ReplaceSimpleConstantInstruction {
   private static final String METHOD_TYPE_PRINTLN = "(Ljava/lang/String;)V";
 
   public static void main(String[] args)
-      throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+      throws ClassNotFoundException,
+          NoSuchMethodException,
+          InvocationTargetException,
           IllegalAccessException {
     // Create a sample class by re-using the CreateHelloWorldClass example
     ProgramClass helloWorld =

examples/src/main/java/proguard/examples/util/ExampleUtil.java

@@ -79,7 +79,9 @@ public static Object executeMethod(
       String methodName,
       Class<?>[] parameterTypes,
       Object[] arguments)
-      throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
+      throws ClassNotFoundException,
+          NoSuchMethodException,
+          InvocationTargetException,
           IllegalAccessException {
     ClassPoolClassLoader classPoolClassLoader = new ClassPoolClassLoader(classPool);
     Class<?> clazz = classPoolClassLoader.findClass(ClassUtil.externalClassName(internalClassName));

gradle.properties

@@ -2,7 +2,7 @@
 
 proguardCoreVersion = 9.1.7
 
-kotlinVersion = 2.0.0
+kotlinVersion = 2.1.0
 
 org.gradle.vfs.watch=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists