compileSdk=35 and fix debug variant of internal testutil

Author: mannodermaus

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

@@ -8,6 +8,7 @@ object libs {
         const val junitPlatform = "1.12.0"
 
         const val composeBom = "2025.03.00"
+        const val androidXMultidex = "2.0.1"
         const val androidXTestAnnotation = "1.0.1"
         const val androidXTestCore = "1.6.1"
         const val androidXTestMonitor = "1.7.2"
@@ -76,6 +77,7 @@ object libs {
     const val truthJava8Extensions = "com.google.truth.extensions:truth-java8-extension:${versions.truth}"
     const val robolectric = "org.robolectric:robolectric:${versions.robolectric}"
 
+    const val androidXMultidex = "androidx.multidex:multidex:${versions.androidXMultidex}"
     const val androidXTestAnnotation = "androidx.test:annotation:${versions.androidXTestAnnotation}"
     const val androidXTestCore = "androidx.test:core:${versions.androidXTestCore}"
     const val androidXTestMonitor = "androidx.test:monitor:${versions.androidXTestMonitor}"

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

@@ -40,15 +40,14 @@ enum class SupportedAgp(
 }
 
 object Android {
-    const val compileSdkVersion = 34
-    const val targetSdkVersion = 34
+    const val compileSdkVersion = 35
+    const val targetSdkVersion = 35
     const val sampleMinSdkVersion = 21
     val testRunnerMinSdkVersion = (Artifacts.Instrumentation.Runner.platform as Android).minSdk
     val testCoreMinSdkVersion = (Artifacts.Instrumentation.Core.platform as Android).minSdk
     val testComposeMinSdkVersion = (Artifacts.Instrumentation.Compose.platform as Android).minSdk
 }
 
-
 sealed class Platform(val name: String) {
     object Java : Platform("java")
     class Android(val minSdk: Int) : Platform("android")

instrumentation/testutil/build.gradle.kts

@@ -14,7 +14,8 @@ android {
   compileSdk = Android.compileSdkVersion
 
   defaultConfig {
-    minSdk = 4
+    minSdk = 19
+    multiDexEnabled = true
   }
 
   compileOptions {
@@ -58,6 +59,7 @@ tasks.withType<Test> {
 
 dependencies {
   implementation(project(":testutil-reflect"))
+  implementation(libs.androidXMultidex)
 
   api(libs.androidXTestMonitor)
   api(libs.truth)