fix: bundle complete Kotlin plugin runtime

Author: CoderYellow

.github/workflows/ci.yml

@@ -26,11 +26,12 @@ jobs:
         run: |
           repo="$PWD/build/dependency-bundle/m2/repository"
           test -n "$(find "$repo" -name 'kotlin-gradle-plugin-*.jar' -print -quit)"
+          test -n "$(find "$repo/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin" -name '*.pom' -print -quit)"
           test -n "$(find "$repo" -name 'gradle-kotlin-dsl-plugins-*.jar' -print -quit)"
           test -n "$(find "$repo" -name 'kotlinpoet-jvm-*.jar' -print -quit)"
           test -n "$(find "$repo" -name '*-sources.jar' -print -quit)"
           test -n "$(find "$repo" -name '*.module' -print -quit)"
-          version=$(sed -n 's/^version=//p' gradle.properties)
+          version=$(sed -n 's/^version[[:space:]]*=[[:space:]]*//p' gradle.properties)
           group="$repo/org/openprojectx/gradle/dependency/bundle"
           test -f "$group/org.openprojectx.gradle.dependency.bundle.gradle.plugin/$version/org.openprojectx.gradle.dependency.bundle.gradle.plugin-$version.pom"
           test -f "$group/plugin/$version/plugin-$version.pom"
@@ -41,7 +42,7 @@ jobs:
         run: |
           mkdir -p build/offline-gradle-home
           cp -R build/dependency-bundle-gradle-home/wrapper build/offline-gradle-home/
-          version=$(sed -n 's/^version=//p' gradle.properties)
+          version=$(sed -n 's/^version[[:space:]]*=[[:space:]]*//p' gradle.properties)
           ./gradlew --no-daemon -g build/offline-gradle-home -p example \
             -PbundleRepository="$PWD/build/dependency-bundle/m2/repository" \
             -PbundlePluginVersion="$version" \

build.gradle.kts

@@ -202,8 +202,10 @@ val prepareExampleGradleHome by tasks.registering(Sync::class) {
     group = "dependency bundle"
     description = "Creates a clean Gradle home containing only the cached wrapper distribution."
     dependsOn(captureRootDependencyBundle)
-    from(bundleGradleHome.map { it.dir("wrapper") })
-    into(exampleGradleHome.map { it.dir("wrapper") })
+    from(bundleGradleHome.map { it.dir("wrapper") }) {
+        into("wrapper")
+    }
+    into(exampleGradleHome)
 }
 
 val buildExampleAgainstBundle by tasks.registering(Exec::class) {

gradle/dependency-bundle.init.gradle

@@ -27,6 +27,10 @@ gradle.beforeProject { project ->
             // The independent example runs offline before its own graph is
             // captured, so seed its complete runtime graph in the root bundle.
             module("com.squareup:kotlinpoet:2.3.0")
+            module("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.2.21")
+            // KGP resolves this lazily when the first Kotlin compile task runs;
+            // it is not present on the plugin classpath itself.
+            module("org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.21")
             module("org.gradle.kotlin:gradle-kotlin-dsl-plugins:6.5.2")
             gradleApiVariants(
                 "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21",

plugin/src/main/kotlin/org/openprojectx/gradle/dependency/bundle/ExportDependencyBundleTask.kt

@@ -309,16 +309,25 @@ abstract class ExportDependencyBundleTask : DefaultTask() {
             val module = directory.parent.fileName.toString()
             val baseVersion = version.removeSuffix("-SNAPSHOT")
             val uniquePattern = Regex(
-                "^${Regex.escape("$module-$baseVersion-")}\\d{8}\\.\\d{6}-\\d+(.*)$"
+                "^${Regex.escape("$module-$baseVersion-")}(\\d{8}\\.\\d{6})-(\\d+)(.*)$"
             )
             val latestBySuffix = Files.list(directory).use { files ->
                 files.filter(Files::isRegularFile)
                     .map { file -> file to uniquePattern.matchEntire(file.fileName.toString()) }
                     .filter { (_, match) -> match != null }
-                    .map { (file, match) -> match!!.groupValues[1] to file }
+                    .map { (file, match) ->
+                        SnapshotFile(
+                            path = file,
+                            timestamp = match!!.groupValues[1],
+                            buildNumber = match.groupValues[2].toInt(),
+                            suffix = match.groupValues[3],
+                        )
+                    }
                     .toList()
-                    .groupBy({ it.first }, { it.second })
-                    .mapValues { (_, candidates) -> candidates.maxBy { it.fileName.toString() } }
+                    .groupBy { it.suffix }
+                    .mapValues { (_, candidates) ->
+                        candidates.maxWith(compareBy<SnapshotFile>({ it.timestamp }, { it.buildNumber })).path
+                    }
             }
 
             latestBySuffix.forEach { (suffix, source) ->
@@ -335,6 +344,13 @@ abstract class ExportDependencyBundleTask : DefaultTask() {
         }
     }
 
+    private data class SnapshotFile(
+        val path: Path,
+        val timestamp: String,
+        val buildNumber: Int,
+        val suffix: String,
+    )
+
     /**
      * Maven POM-only modules do not describe source artifacts. Try the conventional
      * classifier for every release module that has a primary JAR, while treating a