Code clean up based on PR comment. Also lower the assembled artifact to Java 11. Change to buildScan to develocity since the enterprise is already deprecated.

Author: rcw3bb

build.gradle

@@ -7,17 +7,19 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.51.0'
 }
 
-buildScan {
-    termsOfServiceUrl   = 'https://gradle.com/terms-of-service'
-    termsOfServiceAgree = 'yes'
+develocity {
+    buildScan {
+        termsOfUseUrl   = 'https://gradle.com/help/legal-terms-of-use'
+        termsOfUseAgree = 'yes'
+    }
 }
 
 group 'org.javamodularity'
 version '2.0.0'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 repositories {

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "4.2.1"
 }
 
 rootProject.name = 'moduleplugin'

src/main/java/org/javamodularity/moduleplugin/internal/CompileModuleInfoHelper.java

@@ -37,9 +37,8 @@ public static void dependOnOtherCompileModuleInfoJavaTasks(JavaCompile javaCompi
      */
     private static Stream<Task> dependentCompileModuleInfoJavaTaskStream(Project project) {
         final Function<Dependency, TaskContainer> mapToTaskContainer = dependency ->
-                GradleVersion.current().compareTo(GradleVersion.version("8.11")) < 0
-                        ? ((ProjectDependency) dependency).getDependencyProject().getTasks()
-                        : project.project(((ProjectDependency) dependency).getPath()).getTasks();
+                project.project(((ProjectDependency) dependency)
+                        .getPath() /* ProjectDependency.getPath() introduced in Gradle 8.11 */).getTasks();
 
         return project.getConfigurations().stream()
                 .flatMap(configuration -> configuration.getDependencies().stream())

src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java

@@ -300,7 +300,7 @@ void smokeTestRunStartScripts(
 
     @Test
     void shouldNotCheckInWithCommentedOutVersions() {
-        assertEquals(2, GradleVersion.values().length);
+        assertEquals(4, GradleVersion.values().length);
     }
 
     private static void assertTasksSuccessful(BuildResult result, String subprojectName, String... taskNames) {
@@ -341,19 +341,15 @@ private boolean checkJUnitCombination(final String junitVersion, final GradleVer
 
     private static int javaMajorVersion() {
         final String version = System.getProperty("java.version");
-        if (version.startsWith("1.")) {
-            // Java 8 and earlier (1.8.0_xxx format) - not supported anymore but keep for completeness
-            return Integer.parseInt(version.substring(2, version.indexOf(".", 2)));
-        } else {
-            // Java 9+ (9.0.1, 11.0.2, 17.0.2 format)
-            int dotIndex = version.indexOf(".");
-            if (dotIndex == -1) {
-                // Handle cases like "17" without dot
-                return Integer.parseInt(version);
-            }
-            return Integer.parseInt(version.substring(0, dotIndex));
+
+        // Java 9+ (9.0.1, 11.0.2, 17.0.2 format)
+        int dotIndex = version.indexOf(".");
+        if (dotIndex == -1) {
+            // Handle cases like "17" without dot
+            return Integer.parseInt(version);
         }
 
+        return Integer.parseInt(version.substring(0, dotIndex));
     }
 
     private boolean jdkSupported(final GradleVersion gradleVersion) {