From ffa87bce1ee4833456a70d962cefe891421b9af0 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Tue, 8 Aug 2023 17:39:05 +0200 Subject: [PATCH] Version 1.4 --- CHANGELOG.md | 1 - README.MD | 6 +++--- build.gradle.kts | 5 ++++- gradle/plugins/build.gradle.kts | 4 ---- samples/configuration-cache/build-logic/build.gradle.kts | 2 +- samples/kotlin/build-logic/build.gradle.kts | 2 +- .../gradle/plugins/build.gradle.kts | 2 +- samples/module-info-dsl/gradle/plugins/build.gradle.kts | 2 +- samples/versions-in-catalog/build-logic/build.gradle.kts | 2 +- samples/versions-in-platform/build-logic/build.gradle.kts | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3db1fe..6a65af4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ * [#45](https://github.com/gradlex-org/java-module-dependencies/issues/45) Support Capability Coordinates in mappings ## Version 1.3.1 - * Fix integration with analysis plugin if root projects are involved * Fix in module name calculation for additional source sets * Improve dependency analysis reporting for source sets without module-info.java diff --git a/README.MD b/README.MD index 481f7db..b05a273 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.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") } ``` @@ -154,14 +154,14 @@ If you have a `prefixOfYourChoice`, all your Modules **need to have the same pre ## Define Module versions in a Platform project as Dependency Constraints Use Gradle's dependency constraints and/or platforms to define versions for the modules you depend on. -For that the plugin offers a `moduleInfo { }` block in `java-platform` projects. +For that you can combine the `java-platform` with the `org.gradlex.java-module-versions` plugin which adds a `moduleInfo { }` configuration block. In that block, you have the `version("module.name", "1.0")` notation to define a version by Module Name instead of coordinates. For libraries that consist of multiple components and have a BOM for version management, you might prefer to include the BOM, which you need to do by coordinates, because a BOM does not have a Module Name. ``` plugins { id("java-platform") - id("org.gradlex.java-module-dependencies") + id("org.gradlex.java-module-versions") } // Define versions for Modules via the Module Name diff --git a/build.gradle.kts b/build.gradle.kts index 0cc0965..74b36c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "org.gradlex" -version = "1.3.1" +version = "1.4" java { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -45,6 +45,9 @@ pluginPublishConventions { gradlePlugin.plugins.create("java-module-versions") { id = "${project.group}.${name}" implementationClass = "org.gradlex.javamodule.dependencies.JavaModuleVersionsPlugin" + displayName = "Java Module Versions Gradle Plugin" + description = "A plugin that makes Gradle respect the dependencies defined in 'module-info.java' files." + tags = listOf("gradlex", "java", "modularity", "jigsaw", "jpms", "dependencies", "versions") } tasks.test { diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts index a6fcbcf..bc0172f 100644 --- a/gradle/plugins/build.gradle.kts +++ b/gradle/plugins/build.gradle.kts @@ -1,7 +1,3 @@ plugins { `kotlin-dsl` } - -dependencies { - implementation("com.gradle.publish:plugin-publish-plugin:1.0.0") -} diff --git a/samples/configuration-cache/build-logic/build.gradle.kts b/samples/configuration-cache/build-logic/build.gradle.kts index 42bc24a..d676c41 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.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") } \ 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 5878b91..e1aedbb 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.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") 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 069d2ab..3dea0bf 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.20.0") - implementation("org.gradlex:java-module-dependencies:1.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") implementation("org.gradlex:java-module-testing:1.2") } \ 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 069d2ab..3dea0bf 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.20.0") - implementation("org.gradlex:java-module-dependencies:1.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") implementation("org.gradlex:java-module-testing:1.2") } \ 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 42bc24a..d676c41 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.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") } \ 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 42bc24a..d676c41 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.3.1") + implementation("org.gradlex:java-module-dependencies:1.4") } \ No newline at end of file