Merge pull request #67 from modelix/lib-resolution-without-deployment-descriptor

Support jar resolution without deployment descriptor

Author: slisson

build-tools-lib/src/main/kotlin/org/modelix/buildtools/FoundModule.kt

@@ -112,14 +112,31 @@ class FoundModule(
             if (modulePath.isFile) modulePath = modulePath.parentFile
             val moduleMacro = "module" to modulePath.toPath()
             val marcosWithModule = macros.with(moduleMacro)
-            result += moduleDescriptor.resolveJavaLibs(marcosWithModule)
-                .map { it.normalize().toFile() }.filter {
-                    val exists = it.exists()
-                    if (!exists && it.name != "classes" && deploymentDescriptor == null) {
-                        println("File not found: $it, usedBy: $name")
+            result += moduleDescriptor.javaLibPaths.mapNotNull { javaLibPath ->
+                val resolvedPath = marcosWithModule.resolve(javaLibPath).normalize()
+                if (resolvedPath.toFile().exists()) return@mapNotNull resolvedPath.toFile()
+
+                if (deploymentDescriptor == null) {
+                    // If the module is packaged inside a jar without a deployment descriptor then the paths may not be
+                    // correct. Try to fix the path.
+                    if (javaLibPath.startsWith("\${module}/")) {
+                        val tail = javaLibPath.substringAfter("\${module}/").replace("../", "").trimStart('/')
+                        var currentParent: File? = modulePath
+                        while (currentParent != null) {
+                            val candidate = currentParent.resolve(tail)
+                            if (candidate.exists()) {
+                                return@mapNotNull candidate
+                            }
+                            currentParent = currentParent.parentFile.takeIf { it != currentParent }
+                        }
+                    }
+                    if (!javaLibPath.endsWith("classes")) {
+                        println("File not found: $javaLibPath, usedBy: $name, modulePath: $modulePath")
                     }
-                    exists
                 }
+
+                null
+            }
         }
         val deploymentDescriptor = deploymentDescriptor
         if (deploymentDescriptor != null) {
@@ -130,7 +147,7 @@ class FoundModule(
                 .map { it.normalize().toFile() }.filter {
                     val exists = it.exists()
                     if (!exists) {
-                        println("File not found: $it, usedBy: $name")
+                        println("File not found: $it, usedBy: $name, modulePath: $moduleHome")
                     }
                     exists
                 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME