ProcessingPlugin fixes

Author: catilac

app/build.gradle.kts

@@ -142,6 +142,8 @@ dependencies {
     testImplementation(libs.mockitoKotlin)
     testImplementation(libs.junitJupiter)
     testImplementation(libs.junitJupiterParams)
+
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
 }
 

app/utils/build.gradle.kts

@@ -10,6 +10,7 @@ repositories {
 dependencies {
     testImplementation(platform("org.junit:junit-bom:5.10.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 publishing{
@@ -23,4 +24,4 @@ publishing{
 
 tasks.test {
     useJUnitPlatform()
-}
+}

gradle/plugins/library/build.gradle.kts

@@ -23,11 +23,12 @@ repositories {
 
 dependencies {
     testImplementation(kotlin("test"))
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.test {
     useJUnitPlatform()
 }
 kotlin {
     jvmToolchain(17)
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,3 +1,5 @@
+import org.gradle.api.internal.tasks.testing.junit.JUnitTestFramework
+
 plugins{
     `java-gradle-plugin`
     alias(libs.plugins.gradlePublish)

gradlew

@@ -255,9 +255,12 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
             project.dependencies.add("runtimeOnly", "org.jogamp.jogl:newt:2.6.0:natives-$variant")
         }
 
+        // Reduce each import to its package prefix: `a.b.*` and `a.b.C` both become `a.b`,
+        // mirroring how the PDE preprocessor normalizes import statements
         val imports = sketchDirs
             .flatMap { dir -> dir.walkTopDown().filter { it.extension == "pde" }.toList() }
-            .flatMap { Regex("""^\s*import\s+([\w.]+)\s*;""", RegexOption.MULTILINE).findAll(it.readText()).map { m -> m.groupValues[1] } }
+            .flatMap { Regex("""^\s*import\s+(?:static\s+)?([\w.]+(?:\.\*)?)\s*;""", RegexOption.MULTILINE).findAll(it.readText()).map { m -> m.groupValues[1] } }
+            .map { it.removeSuffix(".*") }
             .toSet()
         if (imports.isEmpty()) return
 
@@ -274,7 +277,7 @@ class ProcessingPlugin @Inject constructor(private val objectFactory: ObjectFact
                     val hit = jf.entries().asSequence()
                         .filter { it.name.endsWith(".class") }
                         .map { it.name.substringBeforeLast('/').replace('/', '.') }
-                        .any { it.startsWith(import) }
+                        .any { pkg -> pkg == import || pkg.startsWith("$import.") || import.startsWith("$pkg.") }
                     if (hit) matched.add(jar)
                 }
             }