Fix test task dependency

annotations/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 afterEvaluate {
     publishing {
-        publications.getByName(project.name) {
+        publications.named(project.name) {
             pom {
                 description = 'Java annotations to configure ProGuard, the free shrinker, optimizer, obfuscator, and preverifier for Java bytecode'
             }

ant/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     implementation 'org.apache.ant:ant:1.10.15'
 }
 
-task fatJar(type: ShadowJar) {
+def fatJar = tasks.register("fatJar", ShadowJar) {
     destinationDirectory.set(file("$rootDir/lib"))
     archiveFileName.set('proguard-ant.jar')
     from sourceSets.main.output
@@ -32,7 +32,7 @@ assemble.dependsOn fatJar
 
 afterEvaluate {
     publishing {
-        publications.getByName(project.name) {
+        publications.named(project.name) {
             pom {
                 description = 'Ant plugin for ProGuard, the free shrinker, optimizer, obfuscator, and preverifier for Java bytecode'
             }

base/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'java-library'
     id 'maven-publish'
@@ -11,10 +13,10 @@ repositories {
     mavenCentral()
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-  kotlinOptions {
-    jvmTarget = "${target}"
-  }
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(project.findProperty("target")))
+    }
 }
 
 dependencies {
@@ -54,24 +56,25 @@ test {
     useJUnitPlatform()
 }
 
-task testAllJavaVersions() { testAllTask ->
+def testAllJavaVersion = tasks.register("testAllJavaVersions"){ testAllTask ->
     dependsOn(test) // the usual test runs on Java 8
+}
 
-    javaVersionsForTest.each {version ->
-        task("testJava$version", type: Test) {
-            useJUnitPlatform()
-            ignoreFailures = true
+javaVersionsForTest.each {version ->
+    def testJavaVersion = tasks.register("testJava$version", Test) {
+        useJUnitPlatform()
+        ignoreFailures = true
 
-            // The version of bytebuddy used by mockk only supports Java 22 experimentally so far
-            // if (version >= 22) 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)
 
-            javaLauncher = javaToolchains.launcherFor {
-                languageVersion = JavaLanguageVersion.of(version)
-            }
+        javaLauncher = javaToolchains.launcherFor {
+            languageVersion = JavaLanguageVersion.of(version)
         }
     }
+    testAllJavaVersion.configure { it.dependsOn(testJavaVersion) }
+
 }
 
 jacocoTestReport {
@@ -94,7 +97,7 @@ jacocoTestReport {
 
 afterEvaluate {
     publishing {
-        publications.getByName(project.name) {
+        publications.named(project.name) {
             pom {
                 description = 'ProGuard is a free shrinker, optimizer, obfuscator, and preverifier for Java bytecode'
             }

base/src/main/java/proguard/fixer/kotlin/KotlinAnnotationFlagFixer.java

@@ -131,16 +131,19 @@ implements   KotlinMetadataVisitor,
             kotlinPropertyMetadata.flags.hasAnnotations = false;
         }
 
-        if (kotlinPropertyMetadata.referencedGetterMethod != null)
+        if (kotlinPropertyMetadata.getterMetadata != null &&
+                kotlinPropertyMetadata.getterMetadata.referencedMethod != null)
         {
-            kotlinPropertyMetadata.referencedGetterMethod.accept(clazz, annotationCounter.reset());
-            kotlinPropertyMetadata.getterFlags.hasAnnotations = annotationCounter.getCount() > 0;
+            kotlinPropertyMetadata.getterMetadata.referencedMethod.accept(clazz, annotationCounter.reset());
+            kotlinPropertyMetadata.getterMetadata.hasAnnotations = annotationCounter.getCount() > 0;
         }
 
-        if (kotlinPropertyMetadata.flags.isVar && kotlinPropertyMetadata.referencedSetterMethod != null)
+        if (kotlinPropertyMetadata.flags.isVar &&
+                kotlinPropertyMetadata.setterMetadata != null &&
+                kotlinPropertyMetadata.setterMetadata.referencedMethod != null)
         {
-            kotlinPropertyMetadata.referencedSetterMethod.accept(clazz, annotationCounter.reset());
-            kotlinPropertyMetadata.setterFlags.hasAnnotations = annotationCounter.getCount() > 0;
+            kotlinPropertyMetadata.setterMetadata.referencedMethod.accept(clazz, annotationCounter.reset());
+            kotlinPropertyMetadata.setterMetadata.hasAnnotations = annotationCounter.getCount() > 0;
         }
     }
 
@@ -278,9 +281,10 @@ implements   KotlinMetadataVisitor,
                                                 kotlinPropertyMetadata,
                                                 this);
 
-        if (kotlinValueParameterMetadata.flags.hasAnnotations)
+        if (kotlinValueParameterMetadata.flags.hasAnnotations &&
+                kotlinPropertyMetadata.setterMetadata != null)
         {
-            kotlinPropertyMetadata.referencedSetterMethod.accept(clazz, annotationCounter.reset());
+            kotlinPropertyMetadata.setterMetadata.referencedMethod.accept(clazz, annotationCounter.reset());
             kotlinValueParameterMetadata.flags.hasAnnotations =
                 annotationCounter.getParameterAnnotationCount(kotlinValueParameterMetadata.index) > 0;
         }

base/src/main/java/proguard/mark/Marker.java

@@ -146,8 +146,8 @@ public class Marker implements Pass
                                                  KotlinDeclarationContainerMetadata kotlinDeclarationContainerMetadata,
                                                  KotlinPropertyMetadata kotlinPropertyMetadata) {
                         List<Processable> processables = Stream.of(kotlinPropertyMetadata.referencedBackingField,
-                                                                   kotlinPropertyMetadata.referencedGetterMethod,
-                                                                   kotlinPropertyMetadata.referencedSetterMethod)
+                                                                   kotlinPropertyMetadata.getterMetadata.referencedMethod,
+                                                                   kotlinPropertyMetadata.setterMetadata != null ? kotlinPropertyMetadata.setterMetadata.referencedMethod : null)
                                                                 .filter(Objects::nonNull)
                                                                 .collect(Collectors.toList());
                         int flags = 0;

base/src/main/java/proguard/obfuscate/kotlin/KotlinPropertyNameObfuscator.java

@@ -64,11 +64,13 @@ implements   KotlinMetadataVisitor,
         if ((kotlinPropertyMetadata.referencedBackingField != null &&
              (kotlinPropertyMetadata.referencedBackingField.getProcessingFlags() & ProcessingFlags.DONT_OBFUSCATE) != 0) ||
 
-            (kotlinPropertyMetadata.referencedGetterMethod != null &&
-             (kotlinPropertyMetadata.referencedGetterMethod.getProcessingFlags() & ProcessingFlags.DONT_OBFUSCATE) != 0) ||
+            (kotlinPropertyMetadata.getterMetadata != null &&
+                    kotlinPropertyMetadata.getterMetadata.referencedMethod != null &&
+                    (kotlinPropertyMetadata.getterMetadata.referencedMethod.getProcessingFlags() & ProcessingFlags.DONT_OBFUSCATE) != 0) ||
 
-            (kotlinPropertyMetadata.referencedSetterMethod != null &&
-             (kotlinPropertyMetadata.referencedSetterMethod.getProcessingFlags() & ProcessingFlags.DONT_OBFUSCATE) != 0))
+            (kotlinPropertyMetadata.setterMetadata != null &&
+                    kotlinPropertyMetadata.setterMetadata.referencedMethod != null &&
+                    (kotlinPropertyMetadata.setterMetadata.referencedMethod.getProcessingFlags() & ProcessingFlags.DONT_OBFUSCATE) != 0))
         {
             return;
         }

base/src/main/java/proguard/obfuscate/kotlin/KotlinValueParameterUsageMarker.java

@@ -114,14 +114,14 @@ implements KotlinMetadataVisitor,
                                  KotlinPropertyMetadata             kotlinPropertyMetadata)
     {
         keepParameterInfo = false;
-        if (kotlinPropertyMetadata.referencedSetterMethod != null)
+        if (kotlinPropertyMetadata.setterMetadata != null && kotlinPropertyMetadata.setterMetadata.referencedMethod != null)
         {
-            kotlinPropertyMetadata.referencedSetterMethod.accept(clazz, this);
+            kotlinPropertyMetadata.setterMetadata.referencedMethod.accept(clazz, this);
         }
 
         if (keepParameterInfo)
         {
-            kotlinPropertyMetadata.setterParametersAccept(clazz, kotlinDeclarationContainerMetadata, this);
+            kotlinPropertyMetadata.setterParameterAccept(clazz, kotlinDeclarationContainerMetadata, this);
         }
     }
 

base/src/main/java/proguard/optimize/kotlin/KotlinContextReceiverUsageMarker.java

@@ -108,8 +108,8 @@ public class KotlinContextReceiverUsageMarker implements
     public void visitAnyProperty(Clazz clazz, KotlinDeclarationContainerMetadata kotlinDeclarationContainerMetadata, KotlinPropertyMetadata kotlinPropertyMetadata)
     {
         markContextReceiverParameters(kotlinPropertyMetadata.contextReceivers,
-            kotlinPropertyMetadata.referencedGetterMethod,
-            kotlinPropertyMetadata.referencedSetterMethod);
+            kotlinPropertyMetadata.getterMetadata.referencedMethod,
+            kotlinPropertyMetadata.setterMetadata != null ? kotlinPropertyMetadata.setterMetadata.referencedMethod : null);
     }
 
     private void markContextReceiverParameters(List<KotlinTypeMetadata> contextReceivers, Method...methods)

base/src/main/java/proguard/shrink/ClassUsageMarker.java

@@ -1869,11 +1869,13 @@ implements   ClassVisitor,
                     kotlinPropertyMetadata.referencedBackingField != null &&
                     isUsed(kotlinPropertyMetadata.referencedBackingField);
                 boolean getterUsed =
-                    kotlinPropertyMetadata.referencedGetterMethod != null &&
-                    isUsed(kotlinPropertyMetadata.referencedGetterMethod);
+                    kotlinPropertyMetadata.getterMetadata != null &&
+                    kotlinPropertyMetadata.getterMetadata.referencedMethod != null &&
+                    isUsed(kotlinPropertyMetadata.getterMetadata.referencedMethod);
                 boolean setterUsed =
-                    kotlinPropertyMetadata.referencedSetterMethod != null &&
-                    isUsed(kotlinPropertyMetadata.referencedSetterMethod);
+                        kotlinPropertyMetadata.setterMetadata != null &&
+                                kotlinPropertyMetadata.setterMetadata.referencedMethod != null &&
+                                isUsed(kotlinPropertyMetadata.setterMetadata.referencedMethod);
 
                 if (backingFieldUsed || getterUsed || setterUsed)
                 {
@@ -1914,7 +1916,7 @@ implements   ClassVisitor,
                 kotlinPropertyMetadata.receiverTypeAccept(        clazz, kotlinDeclarationContainerMetadata, this);
                 kotlinPropertyMetadata.contextReceiverTypesAccept(clazz, kotlinDeclarationContainerMetadata, this);
                 kotlinPropertyMetadata.typeParametersAccept(      clazz, kotlinDeclarationContainerMetadata, this);
-                kotlinPropertyMetadata.setterParametersAccept(    clazz, kotlinDeclarationContainerMetadata, this);
+                kotlinPropertyMetadata.setterParameterAccept(    clazz, kotlinDeclarationContainerMetadata, this);
                 kotlinPropertyMetadata.typeAccept(                clazz, kotlinDeclarationContainerMetadata, this);
                 kotlinPropertyMetadata.versionRequirementAccept(  clazz, kotlinDeclarationContainerMetadata, this);
             }

base/src/main/java/proguard/shrink/KotlinShrinker.java

@@ -26,6 +26,7 @@ import proguard.classfile.kotlin.KotlinClassKindMetadata;
 import proguard.classfile.kotlin.KotlinConstants;
 import proguard.classfile.kotlin.KotlinConstructorMetadata;
 import proguard.classfile.kotlin.KotlinDeclarationContainerMetadata;
+import proguard.classfile.kotlin.KotlinEnumEntryMetadata;
 import proguard.classfile.kotlin.KotlinFileFacadeKindMetadata;
 import proguard.classfile.kotlin.KotlinFunctionMetadata;
 import proguard.classfile.kotlin.KotlinMetadata;
@@ -38,6 +39,7 @@ import proguard.classfile.kotlin.KotlinTypeMetadata;
 import proguard.classfile.kotlin.KotlinTypeParameterMetadata;
 import proguard.classfile.kotlin.KotlinValueParameterMetadata;
 import proguard.classfile.kotlin.KotlinVersionRequirementMetadata;
+import proguard.classfile.kotlin.flags.KotlinPropertyAccessorMetadata;
 import proguard.classfile.kotlin.visitor.AllTypeVisitor;
 import proguard.classfile.kotlin.visitor.KotlinConstructorVisitor;
 import proguard.classfile.kotlin.visitor.KotlinFunctionVisitor;
@@ -110,8 +112,7 @@ implements   KotlinMetadataVisitor,
 
         shrinkMetadataArray(kotlinClassKindMetadata.constructors);
 
-        shrinkArray(kotlinClassKindMetadata.enumEntryNames,
-                    kotlinClassKindMetadata.referencedEnumEntries);
+        shrinkEnumEntries(kotlinClassKindMetadata.enumEntries);
 
         shrinkArray(kotlinClassKindMetadata.nestedClassNames,
                     kotlinClassKindMetadata.referencedNestedClasses);
@@ -167,7 +168,7 @@ implements   KotlinMetadataVisitor,
     {
         kotlinPropertyMetadata.versionRequirementAccept(  clazz, kotlinDeclarationContainerMetadata, this);
         kotlinPropertyMetadata.typeAccept(                clazz, kotlinDeclarationContainerMetadata, this);
-        kotlinPropertyMetadata.setterParametersAccept(    clazz, kotlinDeclarationContainerMetadata, this);
+        kotlinPropertyMetadata.setterParameterAccept(    clazz, kotlinDeclarationContainerMetadata, this);
         kotlinPropertyMetadata.receiverTypeAccept(        clazz, kotlinDeclarationContainerMetadata, this);
         kotlinPropertyMetadata.contextReceiverTypesAccept(clazz, kotlinDeclarationContainerMetadata, this);
         kotlinPropertyMetadata.typeParametersAccept(      clazz, kotlinDeclarationContainerMetadata, this);
@@ -179,21 +180,18 @@ implements   KotlinMetadataVisitor,
             kotlinPropertyMetadata.referencedBackingField = null;
         }
 
-        if (shouldShrinkMetadata(kotlinPropertyMetadata.getterSignature,
-                                 kotlinPropertyMetadata.referencedGetterMethod))
+        if (shouldShrinkMetadata(kotlinPropertyMetadata.getterMetadata))
         {
-            kotlinPropertyMetadata.getterSignature        = null;
-            kotlinPropertyMetadata.referencedGetterMethod = null;
+            kotlinPropertyMetadata.getterMetadata.signature        = null;
+            kotlinPropertyMetadata.getterMetadata.referencedMethod = null;
         }
 
-        if (shouldShrinkMetadata(kotlinPropertyMetadata.setterSignature,
-                                 kotlinPropertyMetadata.referencedSetterMethod))
+        if (shouldShrinkMetadata(kotlinPropertyMetadata.setterMetadata))
         {
-            kotlinPropertyMetadata.setterSignature        = null;
-            kotlinPropertyMetadata.referencedSetterMethod = null;
-            kotlinPropertyMetadata.flags.isVar            = false;
-            kotlinPropertyMetadata.setterParameter        = null;
-            kotlinPropertyMetadata.setterParameters.clear();
+            kotlinPropertyMetadata.setterMetadata.signature = null;
+            kotlinPropertyMetadata.setterMetadata.referencedMethod = null;
+            kotlinPropertyMetadata.flags.isVar  = false;
+            kotlinPropertyMetadata.setterParameter  = null;
         }
 
         kotlinPropertyMetadata.versionRequirementAccept(clazz,
@@ -206,7 +204,7 @@ implements   KotlinMetadataVisitor,
             kotlinPropertyMetadata.syntheticMethodForAnnotations           = null;
             kotlinPropertyMetadata.referencedSyntheticMethodForAnnotations = null;
             kotlinPropertyMetadata.referencedSyntheticMethodClass          = null;
-            kotlinPropertyMetadata.flags.hasAnnotations                    = false;
+            kotlinPropertyMetadata.annotations.clear();
         }
 
         if (kotlinPropertyMetadata.syntheticMethodForDelegate != null &&
@@ -220,8 +218,10 @@ implements   KotlinMetadataVisitor,
         // Fix inconsistencies that were introduced as
         // a result of shrinking
         if (kotlinPropertyMetadata.referencedBackingField != null &&
-            kotlinPropertyMetadata.getterSignature        == null &&
-            kotlinPropertyMetadata.setterSignature        == null &&
+                (kotlinPropertyMetadata.setterMetadata == null ||
+                        kotlinPropertyMetadata.setterMetadata.signature == null) &&
+                (kotlinPropertyMetadata.getterMetadata == null ||
+                        kotlinPropertyMetadata.getterMetadata.signature == null) &&
             (kotlinPropertyMetadata.referencedBackingField.getAccessFlags() & AccessConstants.PRIVATE) != 0 &&
             !kotlinPropertyMetadata.flags.visibility.isPrivate)
         {
@@ -399,6 +399,11 @@ implements   KotlinMetadataVisitor,
                !usageMarker.isUsed(jvmElement);
     }
 
+    private boolean shouldShrinkMetadata(KotlinPropertyAccessorMetadata kotlinPropertyAccessorMetadata) {
+        return  kotlinPropertyAccessorMetadata != null && !usageMarker.isUsed(kotlinPropertyAccessorMetadata.referencedMethod);
+    }
+
+
 
     /**
      * Shrinks elements and their corresponding referenced element, based on
@@ -412,10 +417,13 @@ implements   KotlinMetadataVisitor,
         shrinkArray(usageMarker, elements, referencedJavaElements);
     }
 
+    private void shrinkEnumEntries(List<KotlinEnumEntryMetadata> enumEntries) {
+        enumEntries.removeIf(usageMarker::isUsed);
+    }
+
     /**
      * Shrinks elements and their corresponding referenced element, based on
      * markings on the referenced element.
-     *
      * List is modified - must be a modifiable list!
      */
     static void shrinkArray(SimpleUsageMarker               usageMarker,

build.gradle

@@ -13,7 +13,7 @@ allprojects {
     }
 }
 
-task buildDocumentation(type: Exec) {
+tasks.register("buildDocumentation", Exec) {
     inputs.dir 'docs/md'
     inputs.file 'docs/mkdocs.yml'
     outputs.dir 'docs/html'
@@ -60,7 +60,7 @@ allprojects { Project project ->
             configure(project) {
                 publishing {
                     publications {
-                        create(project.name, MavenPublication) {
+                        register(project.name, MavenPublication) {
                             pom {
                                 artifactId = "proguard-$project.name"
                                 name = "$group:$artifactId"
@@ -115,7 +115,7 @@ allprojects { Project project ->
                 }
                 publishing {
                     publications {
-                        getByName(project.name) {
+                        named(project.name) {
                             from components.java
                         }
                     }
@@ -146,31 +146,34 @@ allprojects { Project project ->
 }
 
 distributions {
-    main {
-        distributionBaseName.set('proguard')
-        contents {
-            into('lib') {
-                from tasks.getByPath(':proguard-app:fatJar').outputs
-                from tasks.getByPath(':gui:fatJar').outputs
-                from tasks.getByPath(':retrace:fatJar').outputs
-                from tasks.getByPath(':ant:fatJar').outputs
-            }
-            into('docs') {
-                from('docs/md') {
-                    includeEmptyDirs = false
-                    include '**/*.md'
+        main {
+            distributionBaseName.set('proguard')
+            contents {
+                into("lib") {
+                    def distProjects = [
+                            project(":proguard-app"),
+                            project(":gui"),
+                            project(":retrace"),
+                            project(":ant"),
+                    ]
+                    from(distProjects.collect { it.tasks.named { it == "fatJar" } })
+                }
+                into('docs') {
+                    from('docs/md') {
+                        includeEmptyDirs = false
+                        include '**/*.md'
+                    }
+                }
+                from(rootDir) {
+                    include 'bin/'
+                    include 'examples/'
+                    exclude 'examples/*/build'
+                    exclude 'examples/*/.gradle'
+                    include 'LICENSE'
+                    include 'LICENSE_exception.md'
                 }
             }
-            from(rootDir) {
-                include 'bin/'
-                include 'examples/'
-                exclude 'examples/*/build'
-                exclude 'examples/*/.gradle'
-                include 'LICENSE'
-                include 'LICENSE_exception.md'
-            }
         }
-    }
 }
 
 distTar {

gradle-plugin/build.gradle

@@ -1,5 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     id 'com.github.johnrengelman.shadow'
     id 'java-gradle-plugin'
@@ -24,12 +24,10 @@ gradlePlugin {
     }
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(project.findProperty("target")))
+    }
 }
 
 configurations {
@@ -67,7 +65,7 @@ test {
 
 def localRepo = file("$buildDir/local-repo")
 
-task fatJar(type: ShadowJar) {
+def fatJar = tasks.register("fatJar", ShadowJar) {
     destinationDirectory.set(localRepo)
     archiveFileName.set("proguard-gradle-${version}.jar")
     from sourceSets.main.output

gradle.properties

@@ -1,7 +1,7 @@
-proguardVersion = 7.8.2
+proguardVersion = 7.9.0
 
 # The version of ProGuardCORE that sub-projects are built with
-proguardCoreVersion = 9.2.0
+proguardCoreVersion = 9.3.0
 gsonVersion = 2.11.0
 kotlinVersion = 2.2.0
 target = 1.8

gui/build.gradle

@@ -17,7 +17,7 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-core:2.24.2'
 }
 
-task fatJar(type: ShadowJar) {
+def fatJar = tasks.register("fatJar", ShadowJar) {
     destinationDirectory.set(file("$rootDir/lib"))
     archiveFileName.set('proguardgui.jar')
     from sourceSets.main.output
@@ -35,7 +35,7 @@ assemble.dependsOn fatJar
 
 afterEvaluate {
     publishing {
-        publications.getByName(project.name) {
+        publications.named(project.name) {
             pom {
                 description = 'ProGuardGUI is an interface for ProGuard, the free shrinker, optimizer, obfuscator, and preverifier for Java bytecode'
             }

proguard-app/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 
 jar.manifest.attributes('Implementation-Version': version)
 
-task fatJar(type: ShadowJar) {
+def fatJar = tasks.register("fatJar",ShadowJar) {
     mainClassName = 'proguard.ProGuard'
     destinationDirectory.set(file("$rootDir/lib"))
     archiveFileName.set('proguard.jar')

retrace/build.gradle

@@ -14,7 +14,7 @@ dependencies {
     implementation project(':base')
 }
 
-task fatJar(type: ShadowJar) {
+def fatJar = tasks.register("fatJar", ShadowJar) {
     destinationDirectory.set(file("$rootDir/lib"))
     archiveFileName.set('retrace.jar')
     from sourceSets.main.output
@@ -31,7 +31,7 @@ assemble.dependsOn fatJar
 
 afterEvaluate {
     publishing {
-        publications.getByName(project.name) {
+        publications.named(project.name) {
             pom {
                 description = "ReTrace is a companion tool for ProGuard and DexGuard that 'de-obfuscates' stack traces."
             }