Updated test case for old Gradle/kotlin versions

Author: timhamoni

build.gradle.kts

@@ -8,9 +8,7 @@ group = "org.gradlex"
 version = "1.13.1"
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain.languageVersion = JavaLanguageVersion.of(11)
 }
 
 dependencies {
@@ -36,27 +34,31 @@ pluginPublishConventions {
     }
 }
 
-tasks.withType<Test>().configureEach {
-    group = "verification"
-    classpath = sourceSets.test.get().runtimeClasspath
-    testClassesDirs = sourceSets.test.get().output.classesDirs
-    useJUnitPlatform()
-    maxParallelForks = 4
-}
-
-tasks.named("test") {
+tasks.named<Test>("test") {
     description = "Runs tests against the Gradle version the plugin is built with"
 }
 
 listOf("6.8.3", "6.9.4", "7.6.5", "8.14.2").forEach { gradleVersionUnderTest ->
     val testGradle = tasks.register<Test>("testGradle$gradleVersionUnderTest") {
         description = "Runs tests against Gradle $gradleVersionUnderTest"
         systemProperty("gradleVersionUnderTest", gradleVersionUnderTest)
-        if (gradleVersionUnderTest.startsWith("6")) {
-            javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(11) }
-        }
     }
     tasks.check {
         dependsOn(testGradle)
     }
 }
+
+tasks.withType<Test>().configureEach {
+    group = "verification"
+    classpath = sourceSets.test.get().runtimeClasspath
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    useJUnitPlatform()
+    maxParallelForks = 4
+
+    val gradleMajorVersion = (systemProperties["gradleVersionUnderTest"] as String? ?: gradle.gradleVersion).split(".")[0].toInt()
+    if (gradleMajorVersion >= 7) {
+        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(17) }
+    } else {
+        javaLauncher = javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(11) }
+    }
+}

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/RequireAllDefinedDependenciesFunctionalTest.groovy

@@ -374,7 +374,7 @@ class RequireAllDefinedDependenciesFunctionalTest extends Specification {
         given:
         def sharedBuildScript = """
             extraJavaModuleInfo {
-                versionsProvidingConfiguration = project.provider { project.configurations.named("mainRuntimeClasspath").get() }
+                versionsProvidingConfiguration.set(project.provider { project.configurations.named("mainRuntimeClasspath").get() })
                 module(${libs.commonsHttpClient}, "org.apache.httpcomponents.httpclient")
                 module(${libs.commonsLogging}, "org.apache.commons.logging")
                 knownModule("commons-codec:commons-codec", "org.apache.commons.codec")