Update instrumentation to JUnit 6.0.0, raising its minimum API level to 35

Author: mannodermaus

build-logic/src/main/kotlin/Dependencies.kt

@@ -55,7 +55,7 @@ object libs {
     const val junitVintageEngine = "org.junit.vintage:junit-vintage-engine:${versions.junitFramework}"
     const val junitPlatformCommons = "org.junit.platform:junit-platform-commons:${versions.junitFramework}"
     const val junitPlatformLauncher = "org.junit.platform:junit-platform-launcher:${versions.junitFramework}"
-    const val junitPlatformRunner = "org.junit.platform:junit-platform-runner:${versions.junitFramework}"
+    const val junitPlatformSuiteApi = "org.junit.platform:junit-platform-suite-api:${versions.junitFramework}"
     const val apiguardianApi = "org.apiguardian:apiguardian-api:${versions.apiGuardian}"
 
     const val composeBom = "androidx.compose:compose-bom:${versions.composeBom}"

instrumentation/CHANGELOG.md

@@ -3,6 +3,9 @@ Change Log
 
 ## Unreleased
 
+- Update to Kotlin 2.2
+- Raise minimum supported API level to 35, acknowledging the baseline shift to Java 17 in JUnit 6
+
 ## 1.8.0 (2025-06-11)
 
 - Compile with SDK 35

instrumentation/compose/build.gradle.kts

@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("com.android.library")
@@ -9,7 +10,13 @@ plugins {
   id("org.jetbrains.kotlin.plugin.compose")
 }
 
-val javaVersion = JavaVersion.VERSION_11
+val javaVersion = JavaVersion.VERSION_17
+
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+  }
+}
 
 android {
   namespace = "de.mannodermaus.junit5.compose"
@@ -33,10 +40,6 @@ android {
     targetCompatibility = javaVersion
   }
 
-  kotlinOptions {
-    jvmTarget = javaVersion.toString()
-  }
-
   testOptions {
     unitTests.isReturnDefaultValues = true
     targetSdk = Android.targetSdkVersion

instrumentation/core/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
   id("de.mannodermaus.android-junit5").version(Artifacts.Plugin.latestStableVersion)
 }
 
-val javaVersion = JavaVersion.VERSION_11
+val javaVersion = JavaVersion.VERSION_17
 
 android {
   namespace = "de.mannodermaus.junit5"
@@ -94,7 +94,8 @@ dependencies {
   // This is required by the "instrumentation-runner" companion library,
   // since it can't provide any JUnit 5 runtime libraries itself
   // due to fear of prematurely incrementing the minSdkVersion requirement.
-  runtimeOnly(libs.junitPlatformRunner)
+  runtimeOnly(libs.junitPlatformLauncher)
+  runtimeOnly(libs.junitPlatformSuiteApi)
   runtimeOnly(libs.junitJupiterEngine)
 
   // This transitive dependency of JUnit 5 is required to be on the runtime classpath,

instrumentation/core/src/main/java/de/mannodermaus/junit5/ActivityScenarioExtension.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import android.util.Log
+import androidx.annotation.RequiresApi
 import androidx.test.core.app.ActivityScenario
 import de.mannodermaus.junit5.ActivityScenarioExtension.Companion.launch
 import de.mannodermaus.junit5.internal.LOG_TAG
@@ -110,7 +111,7 @@ import java.util.concurrent.locks.ReentrantLock
  * ```
  *
  */
-@TargetApi(Build.VERSION_CODES.O)
+@RequiresApi(Build.VERSION_CODES.O)
 public class ActivityScenarioExtension<A : Activity>
 private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : BeforeEachCallback,
     AfterEachCallback, ParameterResolver {
@@ -194,7 +195,6 @@ private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : B
 
     /* Private */
 
-    @Suppress("InconsistentCommentForJavaParameter")
     private fun ExtensionContext.acquireLock(state: Boolean) {
         // No need to do anything unless parallelism is enabled
         if (executionMode != ExecutionMode.CONCURRENT) {
@@ -209,7 +209,7 @@ private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : B
         // Create a global lock for restricting test execution to one-by-one;
         // this is necessary to ensure that only one ActivityScenario is ever active at a time,
         // preventing violations of Android's instrumentation and Espresso
-        val lock = store.getOrComputeIfAbsent(
+        val lock = store.computeIfAbsent(
             /* key = */ LOCK_KEY,
             /* defaultCreator = */ { ReentrantLock() },
             /* requiredType = */ ReentrantLock::class.java,
@@ -223,7 +223,7 @@ private constructor(private val scenarioSupplier: () -> ActivityScenario<A>) : B
     }
 
     private fun logConcurrentExecutionWarningOnce(store: ExtensionContext.Store) {
-        store.getOrComputeIfAbsent(WARNING_KEY) {
+        store.computeIfAbsent(WARNING_KEY) {
             setOf(
                 "  [WARNING!] UI tests using ActivityScenarioExtension should not be executed in CONCURRENT mode.",
                 "  We will try to disable parallelism for Espresso tests, but this may be error-prone",

instrumentation/core/src/main/java/de/mannodermaus/junit5/CoreConstants.kt

@@ -1,7 +1,7 @@
 package de.mannodermaus.junit5
 
 /**
- * The minimum Android API level on which JUnit 5 tests may be executed.
+ * The minimum Android API level on which JUnit Framework tests may be executed.
  * Trying to launch a test on an older device will simply mark it as 'skipped'.
  */
-public const val JUNIT5_MINIMUM_SDK_VERSION: Int = 26
+public const val JUNIT5_MINIMUM_SDK_VERSION: Int = 35

instrumentation/core/src/main/java/de/mannodermaus/junit5/internal/DisabledOnSdkVersionCondition.kt

@@ -2,6 +2,7 @@ package de.mannodermaus.junit5.internal
 
 import android.annotation.TargetApi
 import android.os.Build
+import androidx.annotation.RequiresApi
 import de.mannodermaus.junit5.condition.DisabledOnSdkVersion
 import de.mannodermaus.junit5.internal.EnabledOnSdkVersionCondition.Companion.disabled
 import de.mannodermaus.junit5.internal.EnabledOnSdkVersionCondition.Companion.enabled
@@ -18,7 +19,7 @@ internal class DisabledOnSdkVersionCondition : ExecutionCondition {
             ConditionEvaluationResult.enabled("@DisabledOnSdkVersion is not present")
     }
 
-    @TargetApi(24)
+    @RequiresApi(24)
     override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult {
         val optional = findAnnotation(context.element, DisabledOnSdkVersion::class.java)
 

instrumentation/core/src/main/java/de/mannodermaus/junit5/internal/EnabledOnSdkVersionCondition.kt

@@ -2,6 +2,7 @@ package de.mannodermaus.junit5.internal
 
 import android.annotation.TargetApi
 import android.os.Build
+import androidx.annotation.RequiresApi
 import de.mannodermaus.junit5.condition.EnabledOnSdkVersion
 import org.junit.jupiter.api.extension.ConditionEvaluationResult
 import org.junit.jupiter.api.extension.ExecutionCondition
@@ -24,7 +25,7 @@ internal class EnabledOnSdkVersionCondition : ExecutionCondition {
         }
     }
 
-    @TargetApi(24)
+    @RequiresApi(24)
     override fun evaluateExecutionCondition(context: ExtensionContext): ConditionEvaluationResult {
         val optional = findAnnotation(context.element, EnabledOnSdkVersion::class.java)
 

instrumentation/core/src/test/java/de/mannodermaus/junit5/condition/DisabledOnSdkVersionConditionTests.kt

@@ -38,10 +38,10 @@ class DisabledOnSdkVersionConditionTests : AbstractExecutionConditionTests() {
    */
   @Test
   fun disabledBecauseMinApiIsMatched() {
-    withApiLevel(26) {
+    withApiLevel(35) {
       evaluateCondition()
       assertDisabled()
-      assertReasonEquals("Disabled on API 26")
+      assertReasonEquals("Disabled on API 35")
     }
   }
 
@@ -62,10 +62,10 @@ class DisabledOnSdkVersionConditionTests : AbstractExecutionConditionTests() {
    */
   @Test
   fun disabledBecauseApiIsInValidRange() {
-    withApiLevel(26) {
+    withApiLevel(35) {
       evaluateCondition()
       assertDisabled()
-      assertReasonEquals("Disabled on API 26")
+      assertReasonEquals("Disabled on API 35")
     }
   }
 
@@ -74,10 +74,10 @@ class DisabledOnSdkVersionConditionTests : AbstractExecutionConditionTests() {
    */
   @Test
   fun enabledBecauseMinApiLowEnough() {
-    withApiLevel(26) {
+    withApiLevel(35) {
       evaluateCondition()
       assertEnabled()
-      assertReasonEquals("Enabled on API 26")
+      assertReasonEquals("Enabled on API 35")
     }
   }
 

instrumentation/core/src/test/java/de/mannodermaus/junit5/condition/DisabledOnSdkVersionIntegrationTests.kt

@@ -23,7 +23,7 @@ class DisabledOnSdkVersionIntegrationTests {
   }
 
   @Disabled("Used by DisabledOnSdkVersionConditionTests only")
-  @DisabledOnSdkVersion(until = 26)
+  @DisabledOnSdkVersion(until = 35)
   @Test
   fun disabledBecauseMaxApiIsMatched() {
   }