[TS-38628] [Impacted Test Engine] Kotlin Migration

.github/workflows/actions.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Build with Gradle
       run: ./gradlew build
     - name: Upload Release Assets
@@ -79,7 +79,7 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
     - name: Build with Gradle
       run: ./gradlew build
     - name: Upload coverage to Teamscale

.gitignore

@@ -1,4 +1,5 @@
 .gradle/
+.kotlin/
 **/build/**
 **/out/**
 /*/bin/

agent/src/docker/Dockerfile

@@ -1,14 +1,13 @@
 # --- build image ---
 
-FROM openjdk:17 as build
+FROM openjdk:21 AS build
 # install xargs which is needed during the build
 RUN microdnf install findutils
 ADD . /src
 WORKDIR /src
 RUN ./gradlew :agent:shadowJar
 
 # --- production image ---
-
 FROM alpine:latest
 
 RUN mkdir -p /agent
@@ -19,4 +18,15 @@ VOLUME /agent
 # make the image do nothing when started
 # except if /transfer is mounted, then copy the agent there and exit immediately
 # this lets us use the image as an init container in Kubernetes
-CMD exec /bin/sh -c "[ -e /transfer ] && cp -r /agent/teamscale-jacoco-agent.jar /transfer && exit 0 ; trap : TERM INT; sleep infinity & wait"
+COPY <<EOT /entrypoint.sh
+#!/bin/sh
+if [ -e /transfer ]; then
+  cp -r /agent/teamscale-jacoco-agent.jar /transfer
+  exit 0
+fi
+trap : TERM INT
+sleep infinity & wait
+EOT
+RUN chmod +x /entrypoint.sh
+
+CMD ["/entrypoint.sh"]

agent/src/main/java/com/teamscale/jacoco/agent/JaCoCoPreMain.java

@@ -69,7 +69,7 @@ private static IRuntime createRuntime(final Instrumentation inst)
 			final Class<InjectedClassRuntime> clazz = module
 					.loadClassInModule(InjectedClassRuntime.class);
 			return clazz.getConstructor(Class.class, String.class)
-					.newInstance(Object.class, "$JaCoCo");
+					.newInstance(Object.class, "$TeamscaleJaCoCo");
 		}
 
 		return ModifiedSystemClassRuntime.createFor(inst,

agent/src/main/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitPropertiesLocatorUtils.java

@@ -343,7 +343,7 @@ static List<Pair<String, Properties>> findGitPropertiesInArchive(
 	}
 
 	/**
-	 * Returns the CommitInfo (revision & branch + timestmap) from a git properties file. The revision can be either in
+	 * Returns the CommitInfo (revision and branch + timestmap) from a git properties file. The revision can be either in
 	 * {@link #GIT_PROPERTIES_GIT_COMMIT_ID} or {@link #GIT_PROPERTIES_GIT_COMMIT_ID_FULL}. The branch and timestamp in
 	 * {@link #GIT_PROPERTIES_GIT_BRANCH} + {@link #GIT_PROPERTIES_GIT_COMMIT_TIME} or in
 	 * {@link #GIT_PROPERTIES_TEAMSCALE_COMMIT_BRANCH} + {@link #GIT_PROPERTIES_TEAMSCALE_COMMIT_TIME}. By default,

build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
 	alias(libs.plugins.versions)
 	alias(libs.plugins.nexusPublish)
-	kotlin("jvm") apply false
 }
 
 group = "com.teamscale"

buildSrc/build.gradle.kts

@@ -12,4 +12,5 @@ dependencies {
 
     implementation("org.ow2.asm:asm:9.7.1")
     implementation("org.ow2.asm:asm-commons:9.7.1")
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:2.0.20")
 }

buildSrc/src/main/kotlin/com.teamscale.java-convention.gradle.kts

@@ -12,10 +12,19 @@ repositories {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
+tasks.compileJava {
+    options.release = 8
+    options.compilerArgs.add("-Xlint:-options")
+}
+
+tasks.compileTestJava {
+    options.release = 21
+}
+
 tasks.test {
     useJUnitPlatform {
         excludeEngines("teamscale-test-impacted")
@@ -33,6 +42,7 @@ dependencies {
     testImplementation(lib("assertj"))
     testImplementation(lib("mockito-core"))
     testImplementation(lib("mockito-junit"))
+	testImplementation(lib("mockito-kotlin"))
 
     testRuntimeOnly(lib("junit-platform-launcher"))
     testRuntimeOnly(lib("junit-jupiter-engine"))

buildSrc/src/main/kotlin/com.teamscale.kotlin-convention.gradle.kts

@@ -0,0 +1,13 @@
+import org.gradle.kotlin.dsl.kotlin
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    kotlin("jvm")
+    id("com.teamscale.java-convention")
+}
+
+tasks.compileKotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
+}

common-system-test/src/main/java/com/teamscale/test/commons/SystemTestUtils.java

@@ -166,7 +166,10 @@ public static List<Path> getReportFileNames(String mavenProjectPath) throws IOEx
 		}
 	}
 
-	private interface AgentService {
+	/**
+	 * Interface for interacting with an agent service that enables coverage dumping and partition management.
+	 */
+	public interface AgentService {
 		/** Dumps coverage */
 		@POST("/dump")
 		Call<Void> dump();

gradle/libs.versions.toml

@@ -12,7 +12,8 @@ retrofit = "2.11.0"
 junit = "5.11.4"
 junitPlatform = "1.11.4"
 okhttp = "4.12.0"
-mockito = "4.11.0"
+mockito = "5.12.0"
+mockitoKotlin = "5.4.0"
 picocli = "4.7.6"
 
 [libraries]
@@ -75,6 +76,7 @@ jsonassert = { module = "org.skyscreamer:jsonassert", version = "1.5.3" }
 
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
 
 springboot-loader = { module = "org.springframework.boot:spring-boot-loader", version = "3.4.1" }
 

impacted-test-engine/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `java-library`
-    com.teamscale.`java-convention`
+    com.teamscale.`kotlin-convention`
     com.teamscale.coverage
     com.teamscale.`shadow-convention`
     com.teamscale.publish
@@ -18,6 +18,7 @@ dependencies {
 
     compileOnly(libs.junit.platform.engine)
     compileOnly(libs.junit.platform.commons)
-    testImplementation(libs.junit.platform.engine)
+	testImplementation(libs.junit.platform.engine)
     testImplementation(libs.junit.jupiter.params)
+	testImplementation(libs.mockito.kotlin)
 }