Cleanups

melix · Sep 14, 2023 · 3d8c880 · 3d8c880
1 parent b9e8cad
commit 3d8c880
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/build-logic/src/main/kotlin/me.champeau.convention-testing.gradle.kts b/build-logic/src/main/kotlin/me.champeau.convention-testing.gradle.kts
@@ -2,27 +2,29 @@ plugins {
     id("java")
 }
 
+val isCiBuild = providers.environmentVariable("CI").isPresent
+
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 
-    maxParallelForks = if (System.getenv("CI") != null) {
+    maxParallelForks = if (isCiBuild) {
         Runtime.getRuntime().availableProcessors()
     } else {
         // https://docs.gradle.org/8.0/userguide/performance.html#execute_tests_in_parallel
         (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
     }
 }
 
-val currentGradle: String = GradleVersion.current().version
-val allGradle = listOf("6.6", "7.3", "7.6", currentGradle)
-val testJdk = providers.gradleProperty("me.champeau.japicmp.javaToolchain.test")
-    .getOrElse("8").toInt()
-
 tasks.test {
     // Skip default test.
     onlyIf { false }
 }
 
+val currentGradle: String = GradleVersion.current().version
+val allGradle = listOf("6.6", "7.3", "7.6", currentGradle)
+val testJdk = providers.gradleProperty("me.champeau.japicmp.javaToolchain.test")
+    .getOrElse("8").toInt()
+
 // https://docs.gradle.org/current/userguide/compatibility.html
 allGradle.forEach {
     if (it < "7.3" && testJdk >= 17) return@forEach
@@ -32,21 +34,18 @@ allGradle.forEach {
 
 fun testJdkOnGradle(jdkVersion: Int, gradleVersion: String) {
     val task = tasks.register<Test>("testJdk${jdkVersion}onGradle${gradleVersion}") {
-        configureCommon(jdkVersion, gradleVersion)
+        group = LifecycleBasePlugin.VERIFICATION_GROUP
+        description = "Runs the test suite on JDK $jdkVersion and Gradle $gradleVersion"
+
+        systemProperty("gradleVersion", gradleVersion)
+        javaLauncher = javaToolchains.launcherFor {
+            languageVersion = JavaLanguageVersion.of(jdkVersion)
+        }
+
         classpath = tasks.test.get().classpath
         testClassesDirs = tasks.test.get().testClassesDirs
     }
     tasks.check {
         dependsOn(task)
     }
 }
-
-fun Test.configureCommon(jdkVersion: Int, gradleVersion: String) {
-    group = LifecycleBasePlugin.VERIFICATION_GROUP
-    description = "Runs the test suite on JDK $jdkVersion and Gradle $gradleVersion"
-
-    systemProperty("gradleVersion", gradleVersion)
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(jdkVersion)
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,10 +20,12 @@ dependencyResolutionManagement {
 
 rootProject.name = "japicmp-gradle-plugin"
 
+val isCiBuild = providers.environmentVariable("CI").isPresent
+
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = "https://gradle.com/terms-of-service"
         termsOfServiceAgree = "yes"
-        publishAlwaysIf(System.getenv("CI") != null)
+        publishAlwaysIf(isCiBuild)
     }
 }
diff --git a/src/test/groovy/me/champeau/gradle/BomFunctionalTest.groovy b/src/test/groovy/me/champeau/gradle/BomFunctionalTest.groovy
@@ -1,12 +1,7 @@
 package me.champeau.gradle
 
 import org.gradle.testkit.runner.TaskOutcome
-import spock.lang.Requires
 
-@Requires({
-    def major = System.getProperty("gradleVersion").split("\\.").first() as int
-    major >= 6
-})
 class BomFunctionalTest extends BaseFunctionalTest {
     String testProject = 'bom-project'