Limit new feature to Gradle 8.8+

This is because: - IsolatedAction is not available earlier - Using extension accessors in settings file is not available earlier
gradlex-org · Jul 15, 2024 · 04be518 · 04be518
1 parent 5343ab5
commit 04be518
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -73,6 +73,7 @@ testing.suites.named<JvmTestSuite>("test") {
                 description = "Runs tests against Gradle $gradleVersionUnderTest"
                 systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
                 exclude("**/*SamplesTest.class") // Not yet cross-version ready
+                exclude("**/initialization/**") // Settings plugin only for latest Gradle version
             }
         }
     }

diff --git a/.../gradlex/javamodule/dependencies/initialization/JavaModuleDependenciesSettingsPlugin.java b/.../gradlex/javamodule/dependencies/initialization/JavaModuleDependenciesSettingsPlugin.java
@@ -16,15 +16,20 @@
 
 package org.gradlex.javamodule.dependencies.initialization;
 
+import org.gradle.api.GradleException;
 import org.gradle.api.NonNullApi;
 import org.gradle.api.Plugin;
 import org.gradle.api.initialization.Settings;
+import org.gradle.util.GradleVersion;
 
 @NonNullApi
 public abstract class JavaModuleDependenciesSettingsPlugin implements Plugin<Settings> {
 
     @Override
     public void apply(Settings settings) {
+        if (GradleVersion.current().compareTo(GradleVersion.version("8.8")) < 0) {
+            throw new GradleException("This settings plugin requires Gradle 8.8+");
+        }
         registerExtension(settings);
     }
 

diff --git a/src/main/java/org/gradlex/javamodule/dependencies/initialization/JavaModulesExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/initialization/JavaModulesExtension.java
@@ -41,9 +41,6 @@
 
 public abstract class JavaModulesExtension {
 
-    static final boolean SUPPORT_PROJECT_ISOLATION =
-            GradleVersion.current().compareTo(GradleVersion.version("8.8")) >= 0;
-
     private final Settings settings;
     private final ModuleInfoCache moduleInfoCache;
 
@@ -93,11 +90,7 @@ public void versions(String directory) {
         String projectName = Paths.get(directory).getFileName().toString();
         settings.include(projectName);
         settings.project(":" + projectName).setProjectDir(new File(settings.getRootDir(), directory));
-        if (SUPPORT_PROJECT_ISOLATION) {
-            settings.getGradle().getLifecycle().beforeProject(new ApplyJavaModuleVersionsPluginAction(projectName));
-        } else {
-            settings.getGradle().beforeProject(new ApplyJavaModuleVersionsPluginAction(projectName));
-        }
+        settings.getGradle().getLifecycle().beforeProject(new ApplyJavaModuleVersionsPluginAction(projectName));
     }
 
     private void includeModule(Module module, File projectDir) {
@@ -122,11 +115,7 @@ private void includeModule(Module module, File projectDir) {
 
         String group = module.getGroup().getOrNull();
         List<String> plugins = module.getPlugins().get();
-        if (SUPPORT_PROJECT_ISOLATION) {
-            settings.getGradle().getLifecycle().beforeProject(new ApplyPluginsAction(artifact, group, plugins, mainModuleName, moduleInfoCache));
-        } else {
-            settings.getGradle().beforeProject(new ApplyPluginsAction(artifact, group, plugins, mainModuleName, moduleInfoCache));
-        }
+        settings.getGradle().getLifecycle().beforeProject(new ApplyPluginsAction(artifact, group, plugins, mainModuleName, moduleInfoCache));
     }
 
     @NonNullApi

diff --git a/src/main/java/org/gradlex/javamodule/dependencies/initialization/RootPluginsExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/initialization/RootPluginsExtension.java
@@ -24,8 +24,6 @@
 
 import javax.inject.Inject;
 
-import static org.gradlex.javamodule.dependencies.initialization.JavaModulesExtension.SUPPORT_PROJECT_ISOLATION;
-
 public abstract class RootPluginsExtension {
 
     private final Settings settings;
@@ -36,11 +34,7 @@ public RootPluginsExtension(Settings settings) {
     }
 
     public void id(String id) {
-        if (SUPPORT_PROJECT_ISOLATION) {
-            settings.getGradle().getLifecycle().beforeProject(new ApplyPluginAction(id));
-        } else {
-            settings.getGradle().beforeProject(new ApplyPluginAction(id));
-        }
+        settings.getGradle().getLifecycle().beforeProject(new ApplyPluginAction(id));
     }
 
     @NonNullApi

diff --git a/...pendencies/test/SettingsPluginTest.groovy → .../initialization/SettingsPluginTest.groovy b/...pendencies/test/SettingsPluginTest.groovy → .../initialization/SettingsPluginTest.groovy
@@ -1,4 +1,4 @@
-package org.gradlex.javamodule.dependencies.test
+package org.gradlex.javamodule.dependencies.test.initialization
 
 import org.gradlex.javamodule.dependencies.test.fixture.GradleBuild
 import spock.lang.Specification