diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f498c2..86ed8e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Version 1.5.1 * Make `module-info.java` analysis tasks cacheable +* Make `recommendModuleVersions` configuration cache compatible * Further tweak `requires /*runtime*/` support ## Version 1.5 diff --git a/README.MD b/README.MD index 3a8d324..a75c5f3 100644 --- a/README.MD +++ b/README.MD @@ -56,7 +56,7 @@ Add this to the build file of your convention plugin's build ``` dependencies { - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index ba0f9a1..ddb5e83 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "org.gradlex" -version = "1.5" +version = "1.5.1" java { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/samples/configuration-cache/build-logic/build.gradle.kts b/samples/configuration-cache/build-logic/build.gradle.kts index 3cda85d..a67c008 100644 --- a/samples/configuration-cache/build-logic/build.gradle.kts +++ b/samples/configuration-cache/build-logic/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") } \ No newline at end of file diff --git a/samples/kotlin/build-logic/build.gradle.kts b/samples/kotlin/build-logic/build.gradle.kts index bfb7cfa..69bf894 100644 --- a/samples/kotlin/build-logic/build.gradle.kts +++ b/samples/kotlin/build-logic/build.gradle.kts @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") } \ No newline at end of file diff --git a/samples/module-info-dsl-no-platform/gradle/plugins/build.gradle.kts b/samples/module-info-dsl-no-platform/gradle/plugins/build.gradle.kts index 6b0e4dd..0196a70 100644 --- a/samples/module-info-dsl-no-platform/gradle/plugins/build.gradle.kts +++ b/samples/module-info-dsl-no-platform/gradle/plugins/build.gradle.kts @@ -4,6 +4,6 @@ plugins { dependencies { implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.21.0") - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") implementation("org.gradlex:java-module-testing:1.2.1") } \ No newline at end of file diff --git a/samples/module-info-dsl/gradle/plugins/build.gradle.kts b/samples/module-info-dsl/gradle/plugins/build.gradle.kts index 6b0e4dd..0196a70 100644 --- a/samples/module-info-dsl/gradle/plugins/build.gradle.kts +++ b/samples/module-info-dsl/gradle/plugins/build.gradle.kts @@ -4,6 +4,6 @@ plugins { dependencies { implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.21.0") - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") implementation("org.gradlex:java-module-testing:1.2.1") } \ No newline at end of file diff --git a/samples/versions-in-catalog/build-logic/build.gradle.kts b/samples/versions-in-catalog/build-logic/build.gradle.kts index 3cda85d..a67c008 100644 --- a/samples/versions-in-catalog/build-logic/build.gradle.kts +++ b/samples/versions-in-catalog/build-logic/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") } \ No newline at end of file diff --git a/samples/versions-in-platform/build-logic/build.gradle.kts b/samples/versions-in-platform/build-logic/build.gradle.kts index 3cda85d..a67c008 100644 --- a/samples/versions-in-platform/build-logic/build.gradle.kts +++ b/samples/versions-in-platform/build-logic/build.gradle.kts @@ -3,5 +3,5 @@ plugins { } dependencies { - implementation("org.gradlex:java-module-dependencies:1.5") + implementation("org.gradlex:java-module-dependencies:1.5.1") } \ No newline at end of file diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java index d25eca4..6ab91ed 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java @@ -444,7 +444,9 @@ void doAddRequiresRuntimeSupport(SourceSet sourceSetForModuleInfo, SourceSet sou }); List> moduleInfoFolders = requiresRuntime.stream().map(moduleName -> moduleInfoFoldersBase.map(b -> b.dir(moduleName))).collect(Collectors.toList()); - syntheticModuleInfoFolders.from(moduleInfoFolders); + for (Provider syntheticModuleInfoFolder : moduleInfoFolders) { + syntheticModuleInfoFolders.from(syntheticModuleInfoFolder); + } syntheticModuleInfoFolders.builtBy(generatorTask); getDependencies().add(sourceSetForClasspath.getCompileOnlyConfigurationName(), syntheticModuleInfoFolders); }