baseline java 17 and Gradle 9

mark non-testkit base test classes for removal
mark spock-based testkit base classes as deprecated
remove automatic terms of use agreement

Author: John Burns

.github/workflows/build.yml

@@ -24,7 +24,6 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: |
-            11
             17
             21
             ${{ matrix.java }}
@@ -33,6 +32,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
         with:
           cache-overwrite-existing: true
+          build-scan-publish: true
+          build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service'
+          build-scan-terms-of-use-agree: 'yes'
       - name: Gradle build
         run: ./gradlew --stacktrace build
         env:

.github/workflows/publish.yml

@@ -38,6 +38,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v5
         with:
           cache-overwrite-existing: true
+          build-scan-publish: true
+          build-scan-terms-of-use-url: 'https://gradle.com/terms-of-service'
+          build-scan-terms-of-use-agree: 'yes'
       - name: Gradle build
         run: ./gradlew --stacktrace build
       - name: Publish candidate

build.gradle.kts

@@ -1,7 +1,5 @@
 import nebula.plugin.contacts.Contact
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /*
  * Copyright 2014-2019 Netflix, Inc.
@@ -60,23 +58,6 @@ tasks.withType<Test> {
     useJUnitPlatform()
     maxParallelForks = 2
     finalizedBy(tasks.named("jacocoTestReport"))
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-tasks.named<JavaCompile>("compileTestJava") {
-    javaCompiler.set(
-        javaToolchains.compilerFor {
-            languageVersion = JavaLanguageVersion.of(17)
-        }
-    )
-}
-tasks.named<KotlinCompile>("compileTestKotlin") {
-    kotlinJavaToolchain.toolchain.use(
-        javaToolchains.launcherFor {
-            languageVersion = JavaLanguageVersion.of(17)
-        }
-    )
 }
 
 tasks.named("build") {
@@ -85,13 +66,12 @@ tasks.named("build") {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
 kotlin {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
         languageVersion.set(KotlinVersion.KOTLIN_2_0)
         apiVersion.set(KotlinVersion.KOTLIN_2_0)
     }

gradle.lockfile

@@ -3,7 +3,7 @@
 # This file is expected to be part of source control.
 cglib:cglib-nodep:3.2.2=archRulesTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
 com.netflix.nebula:archrules-common:0.9.0=archRulesCompileClasspath,archRulesRuntimeClasspath,archRulesTestCompileClasspath,archRulesTestRuntimeClasspath
-com.netflix.nebula:nebula-archrules-core:0.14.1=archRulesCompileClasspath,archRulesRuntimeClasspath,archRulesTestCompileClasspath,archRulesTestRuntimeClasspath
+com.netflix.nebula:nebula-archrules-core:0.15.1=archRulesCompileClasspath,archRulesRuntimeClasspath,archRulesTestCompileClasspath,archRulesTestRuntimeClasspath
 com.tngtech.archunit:archunit:1.4.1=archRulesCompileClasspath,archRulesRuntimeClasspath,archRulesTestCompileClasspath,archRulesTestRuntimeClasspath
 junit:junit:4.13.2=archRulesTestCompileClasspath,archRulesTestRuntimeClasspath,compileClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.11.13=testCompileClasspath,testRuntimeClasspath

settings.gradle

@@ -8,13 +8,6 @@ plugins {
     id 'com.gradle.develocity' version '4.2'
 }
 
-develocity {
-    buildScan {
-        termsOfUseUrl = 'https://gradle.com/terms-of-service'
-        termsOfUseAgree = 'yes'
-    }
-}
-
 rootProject.name = 'nebula-test'
 
 includeBuild(".") // allows included build to depend on root project

src/archRules/java/com/netflix/nebula/test/archrules/NebulaTestArchRules.java

@@ -1,6 +1,7 @@
 package com.netflix.nebula.test.archrules;
 
 import com.netflix.nebula.archrules.core.ArchRulesService;
+import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.Priority;
 import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
@@ -13,8 +14,7 @@
 import static com.netflix.nebula.archrules.common.CanBeAnnotated.Predicates.deprecatedForRemoval;
 import static com.tngtech.archunit.core.domain.JavaAccess.Predicates.target;
 import static com.tngtech.archunit.core.domain.JavaAccess.Predicates.targetOwner;
-import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideInAPackage;
-import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideOutsideOfPackages;
+import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.are;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.is;
 
@@ -38,11 +38,26 @@ public class NebulaTestArchRules implements ArchRulesService {
             .allowEmptyShould(true)
             .because("deprecated for removal APIs will be removed in the next major version of nebula-test");
 
+    static final ArchRule SPOCK = ArchRuleDefinition.priority(Priority.MEDIUM)
+            .noClasses().that(resideOutsideOfPackages("nebula.test.."))
+            .should()
+            .beAssignableTo("nebula.test.IntegrationBase")
+            .orShould().dependOnClassesThat(assignableTo("nebula.test.IntegrationBase"))
+            .orShould().beAssignableTo("nebula.test.IntegrationTestKitBase")
+            .orShould().dependOnClassesThat(assignableTo("nebula.test.IntegrationTestKitBase"))
+            .orShould().beAssignableTo("nebula.test.IntegrationTestKitSpec")
+            .orShould().dependOnClassesThat(assignableTo("nebula.test.IntegrationTestKitSpec"))
+            .orShould().beAssignableTo("nebula.test.AbstractIntegrationTestKitBase")
+            .orShould().dependOnClassesThat(assignableTo("nebula.test.AbstractIntegrationTestKitBase"))
+            .allowEmptyShould(true)
+            .because("spock base classes will eventually be deprecated in favor of TestKit DSL");
+
     @Override
     public Map<String, ArchRule> getRules() {
         Map<String, ArchRule> rules = new HashMap<>();
         rules.put("noDeprecatedNebulaTest", DEPRECATED);
         rules.put("noDeprecatedForRemovalNebulaTest", DEPRECATED_FOR_REMOVAL);
+        rules.put("don't use spock base classes", SPOCK);
         return rules;
     }
 }

src/archRulesTest/java/com/netflix/nebula/test/archrules/NebulaTestArchRulesTest.java

@@ -3,6 +3,7 @@
 import com.netflix.nebula.archrules.core.Runner;
 import com.tngtech.archunit.lang.EvaluationResult;
 import nebula.test.Integration;
+import nebula.test.IntegrationTestKitSpec;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -18,4 +19,14 @@ public void testNebulaTestArchRule() {
     static abstract class Failing implements Integration {
 
     }
+
+    @Test
+    public void test_spock() {
+        EvaluationResult result = Runner.check(NebulaTestArchRules.SPOCK, Failing.class);
+        assertThat(result.hasViolation()).isTrue();
+    }
+
+    static abstract class SpockFailing extends IntegrationTestKitSpec {
+
+    }
 }

src/main/groovy/nebula/test/BaseIntegrationSpec.groovy

@@ -30,7 +30,7 @@ import spock.lang.Specification
  *
  * This will be removed in the next nebula-test major version
  */
-@Deprecated
+@Deprecated(forRemoval = true)
 abstract class BaseIntegrationSpec extends Specification implements IntegrationBase {
     @Rule
     TestName testName = new TestName()

src/main/groovy/nebula/test/Integration.groovy

@@ -33,7 +33,7 @@ import java.util.function.Predicate
  * @deprecated in favor of Gradle TestKit-based tests
  */
 @CompileStatic
-@Deprecated
+@Deprecated(forRemoval = true)
 abstract trait Integration extends IntegrationBase {
     private static final String DEFAULT_REMOTE_DEBUG_JVM_ARGUMENTS = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
     private static final Integer DEFAULT_DAEMON_MAX_IDLE_TIME_IN_SECONDS_IN_MEMORY_SAFE_MODE = 15;

src/main/groovy/nebula/test/IntegrationBase.groovy

@@ -25,6 +25,7 @@ import org.gradle.api.logging.LogLevel
  *
  * <p>This is testing framework agnostic and can be either extended (see {@link BaseIntegrationSpec}) or composed, by
  * including it inside a test class as field.
+ * Prefer <a href="https://github.com/nebula-plugins/nebula-test/wiki/TestKit-DSL">TestKit DSL</a> instead
  */
 @CompileStatic
 abstract trait IntegrationBase {