Remove deprecated versionsFromPlatformAndConsistentResolution

This was an experimental feature now provided through the
'org.gradlex.jvm-dependency-conflict-resolution' plugin.

Author: jjohannes

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Java Module Dependencies Gradle Plugin - Changelog
 
-## Version 1.9.3
+## Version 1.10
+* [#221](https://github.com/gradlex-org/java-module-dependencies/issues/221) Upgrade to Gradle 9, remove deprecated features
 * [#209](https://github.com/gradlex-org/java-module-dependencies/issues/209) Fix: configuration cache issue when building kotlin-dsl plugins
 * Update module name mappings
 

samples/module-info-dsl-no-platform/gradle/plugins/build.gradle.kts

@@ -6,4 +6,5 @@ dependencies {
     implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.19.0")
     implementation("org.gradlex:java-module-dependencies:1.9.2")
     implementation("org.gradlex:java-module-testing:1.7")
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
 }

samples/module-info-dsl-no-platform/gradle/plugins/src/main/kotlin/org.example.java-base.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("java")
     id("org.gradlex.java-module-dependencies")
     id("org.gradlex.java-module-testing")
+    id("org.gradlex.jvm-dependency-conflict-resolution")
 }
 
 group = "org.example"
@@ -10,8 +11,15 @@ java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
 testing.suites.register<JvmTestSuite>("testFunctional")
 tasks.check { dependsOn(tasks.named("testFunctional")) }
 
-javaModuleDependencies {
-    versionsFromPlatformAndConsistentResolution(":app", ":app")
+jvmDependencyConflicts {
+    consistentResolution {
+        providesVersions(":app")
+    }
+}
+dependencies {
+    implementation(platform(project(":app")) as ModuleDependency) {
+        capabilities { requireCapability("${project.group}:app-platform") }
+    }
 }
 
 tasks.withType<Test>().configureEach {

samples/module-info-dsl/gradle/plugins/build.gradle.kts

@@ -6,4 +6,5 @@ dependencies {
     implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.19.0")
     implementation("org.gradlex:java-module-dependencies:1.9.2")
     implementation("org.gradlex:java-module-testing:1.7")
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.4")
 }

samples/module-info-dsl/gradle/plugins/src/main/kotlin/org.example.java-base.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("java")
     id("org.gradlex.java-module-dependencies")
     id("org.gradlex.java-module-testing")
+    id("org.gradlex.jvm-dependency-conflict-resolution")
 }
 
 group = "org.example"
@@ -10,8 +11,11 @@ java.toolchain.languageVersion.set(JavaLanguageVersion.of(11))
 testing.suites.register<JvmTestSuite>("testFunctional")
 tasks.check { dependsOn(tasks.named("testFunctional")) }
 
-javaModuleDependencies {
-    versionsFromPlatformAndConsistentResolution(":versions", ":app")
+jvmDependencyConflicts {
+    consistentResolution {
+        platform(":versions")
+        providesVersions(":app")
+    }
 }
 
 tasks.withType<Test>().configureEach {

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java

@@ -447,57 +447,6 @@ public Configuration versionsFromConsistentResolution(Collection<String> version
         return mainRuntimeClasspath;
     }
 
-    /**
-     * @deprecated use the 'org.gradlex.jvm-dependency-conflict-resolution' plugin instead.
-     */
-    @Deprecated
-    public Configuration versionsFromPlatformAndConsistentResolution(String platformProject, String... versionsProvidingProjects) {
-        return versionsFromPlatformAndConsistentResolution(platformProject, Arrays.asList(versionsProvidingProjects));
-    }
-
-    /**
-     * @deprecated use the 'org.gradlex.jvm-dependency-conflict-resolution' plugin instead.
-     */
-    @Deprecated
-    public Configuration versionsFromPlatformAndConsistentResolution(String platformProject, Collection<String> versionsProvidingProjects) {
-        boolean platformInJavaProject = versionsProvidingProjects.contains(platformProject);
-
-        maybeCreateInternalConfiguration().withDependencies(d -> {
-            Dependency platformDependency = getDependencies().platform(createDependency(platformProject));
-            if (platformInJavaProject) {
-                if (platformProject.startsWith(":")) {
-                    String capability = ((ProjectDependency) platformDependency).getDependencyProject().getGroup() + platformProject + "-platform";
-                    ((ProjectDependency) platformDependency).capabilities(c -> c.requireCapability(capability));
-                } else if (platformDependency instanceof ModuleDependency) {
-                    String capability = platformProject + "-platform";
-                    ((ModuleDependency) platformDependency).capabilities(c -> c.requireCapability(capability));
-                }
-            }
-            d.add(platformDependency);
-        });
-
-        getSourceSets().configureEach(sourceSet -> {
-            ConfigurationContainer configurations = getConfigurations();
-            Configuration internal = configurations.getByName(INTERNAL);
-            configurations.getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(internal);
-            configurations.getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(internal);
-            configurations.getByName(sourceSet.getAnnotationProcessorConfigurationName()).extendsFrom(internal);
-        });
-
-        return versionsFromConsistentResolution(versionsProvidingProjects);
-    }
-
-    private Configuration maybeCreateInternalConfiguration() {
-        Configuration internal = getConfigurations().findByName(INTERNAL);
-        if (internal != null) {
-            return internal;
-        }
-        return getConfigurations().create(INTERNAL, i -> {
-            i.setCanBeResolved(false);
-            i.setCanBeConsumed(false);
-        });
-    }
-
     private Dependency createDependency(String project) {
         boolean isProjectInBuild = project.startsWith(":");
         return getDependencies().create(isProjectInBuild

src/main/java/org/gradlex/javamodule/dependencies/internal/utils/DependencyDeclarationsUtil.java

@@ -39,16 +39,16 @@ public static Provider<List<String>> declaredDependencies(Project project, Strin
         return project.provider(() -> configurations.getNames().contains(configuration)
                 ? configurations.getByName(configuration).getDependencies().stream()
                     .filter(DependencyDeclarationsUtil::isLibraryDependency)
-                    .map(DependencyDeclarationsUtil::toIdentifier).collect(Collectors.toList())
+                    .map(d -> toIdentifier(project, d)).collect(Collectors.toList())
                 : Collections.emptyList());
     }
 
-    private static String toIdentifier(Dependency dependency) {
+    private static String toIdentifier(Project project, Dependency dependency) {
         if (dependency instanceof ProjectDependency) {
             // assume Module Name of local Module
             ProjectDependency projectDependency = (ProjectDependency) dependency;
             if (projectDependency.getRequestedCapabilities().isEmpty()) {
-                return projectDependency.getDependencyProject().getGroup() + "." +  dependency.getName();
+                return project.getGroup() + "." +  dependency.getName();
             } else {
                 Capability capability = projectDependency.getRequestedCapabilities().get(0);
                 return capability.getGroup() + "." + capability.getName().replace("-", ".");

src/test/java/org/gradlex/javamodule/dependencies/test/fixture/GradleBuild.java

@@ -72,8 +72,10 @@ public GradleBuild(boolean withHelpTasks, Path dir) {
                 id("org.gradlex.java-module-versions")
                 id("application")
             }
-            javaModuleDependencies {
-                versionsFromPlatformAndConsistentResolution(":app", ":app")
+            dependencies {
+                implementation(platform(project(":app")) as ModuleDependency) {
+                    capabilities { requireCapability("${project.group}:app-platform") }
+                }
             }
             application {
                 mainModule.set("org.gradlex.test.app")