Upgrade to androix fragment 1.6.1

...yikes

7 files changed, 49 insertions, 13 deletions

diff --git a/annotation/ksp/build.gradle b/annotation/ksp/build.gradle
index febb5e62..66f4d6e2 100644
--- a/annotation/ksp/build.gradle
+++ b/annotation/ksp/build.gradle
@@ -12,3 +12,9 @@ dependencies {
 }
 
 apply from: "${rootProject.projectDir}/scripts/upload.gradle"
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
diff --git a/annotation/ksp/integrationtest/build.gradle b/annotation/ksp/integrationtest/build.gradle
index 2454135c..03408f94 100644
--- a/annotation/ksp/integrationtest/build.gradle
+++ b/annotation/ksp/integrationtest/build.gradle
@@ -23,6 +23,16 @@ android {
         targetSdk libs.versions.target.sdk.version.get() as int
         versionName VERSION_NAME as String
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+}
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 dependencies {
diff --git a/annotation/ksp/test/build.gradle b/annotation/ksp/test/build.gradle
index c305c65a..9ad8eb14 100644
--- a/annotation/ksp/test/build.gradle
+++ b/annotation/ksp/test/build.gradle
@@ -12,6 +12,16 @@ android {
         targetSdk libs.versions.target.sdk.version.get() as int
         versionName VERSION_NAME as String
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+}
+
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 dependencies {
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index b4962d45..22a35ecc 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -20,6 +20,7 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner 'androidx.benchmark.junit4.AndroidBenchmarkRunner'
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -33,6 +34,8 @@ android {
 }
 
 dependencies {
+    implementation libs.androidx.multidex
+
     androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.junit
diff --git a/build.gradle b/build.gradle
index d2d58898..e71ce474 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,6 +122,15 @@ subprojects { project ->
         }
     }
 
+    afterEvaluate {
+        if (project.plugins.hasPlugin("com.android.application")) {
+            project.dependencies {
+                // Hack around some version mismatches: https://stackoverflow.com/questions/75263047/duplicate-class-in-kotlin-android
+                implementation(platform(libs.kotlin.bom))
+            }
+        }
+    }
+
     tasks.withType(JavaCompile) {
         // gifencoder is a legacy project that has a ton of warnings and is basically never
         // modified, so we're not going to worry about cleaning it up.
diff --git a/renovate.json b/renovate.json
index 03d3193a..1485a25c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,10 +8,6 @@
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true,
       "automergeType": "branch"
-    },
-    {
-      "matchPackageNames": ["androidx.fragment:fragment"],
-      "allowedVersions": "1.4.1"
     }
   ]
 }
diff --git a/settings.gradle b/settings.gradle
index a1688999..addb82c1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -51,21 +51,22 @@ dependencyResolutionManagement {
             version('okhttp-min-sdk-version', '21')
             version('target-sdk-version', '32')
             version('pmd', '6.0.0')
-            version('kotlin-compiler-extension', '1.2.0')
+            // 1.5.3 requires Kotlin 1.9.x, which doesn't seem to be supported by the coroutines
+            // libraries: https://github.com/Kotlin/kotlinx.coroutines/issues/3812
+            version('kotlin-compiler-extension', '1.4.8')
 
             // Versions for dependencies
-            version('compose', '1.5.0')
+            version('compose', '1.5.1')
             version('coroutines', '1.7.3')
             version('dagger', '2.47')
             version('errorprone', '2.18.0')
-            version('kotlin', '1.7.0')
+            version('kotlin', '1.8.22')
             version('mockito', '5.3.1')
             version('retrofit', '2.3.0')
             version('androidx-benchmark', '1.2.0-beta05')
             version('androidx-espresso', '3.5.1')
-            // Newer versions depend on different kotlin versions causing duplicate class paths:
-            version('androidx-fragment', '1.4.1')
-            version('ksp', '1.7.0-1.0.6')
+            version('androidx-fragment', '1.6.1')
+            version('ksp', '1.8.22-1.0.11')
 
             library('androidx-multidex', "androidx.multidex:multidex:2.0.1")
             library('autoservice', 'com.google.auto.service:auto-service:1.0-rc3')
@@ -74,10 +75,10 @@ dependencyResolutionManagement {
             library('androidx-cardview', 'androidx.cardview:cardview:1.0.0')
             library('androidx-core', 'androidx.core:core:1.6.0')
             library('androidx-annotation', 'androidx.annotation:annotation:1.6.0')
-            library('androidx-appcompat', 'androidx.appcompat:appcompat:1.4.0')
+            library('androidx-appcompat', 'androidx.appcompat:appcompat:1.6.1')
             library('androidx-benchmark.gradle', 'androidx.benchmark', 'benchmark-gradle-plugin').versionRef('androidx-benchmark')
             library('androidx-benchmark.junit', 'androidx.benchmark', 'benchmark-junit4').versionRef('androidx-benchmark')
-            library('androidx-core.ktx', 'androidx.core:core-ktx:1.8.0')
+            library('androidx-core.ktx', 'androidx.core:core-ktx:1.12.0')
             library('androidx-espresso', 'androidx.test.espresso', 'espresso-core').versionRef('androidx-espresso')
             library('androidx-espresso.idling', 'androidx.test.espresso.idling', 'idling-concurrent').versionRef('androidx-espresso')
             library('androidx-exifinterface', 'androidx.exifinterface:exifinterface:1.3.6')
@@ -121,7 +122,8 @@ dependencyResolutionManagement {
             library('kotlin-junit', 'org.jetbrains.kotlin', 'kotlin-test-junit').versionRef('kotlin')
             library('kotlin-jdk7', 'org.jetbrains.kotlin', 'kotlin-stdlib-jdk7').versionRef('kotlin')
             library('kotlin-gradle', 'org.jetbrains.kotlin', 'kotlin-gradle-plugin').versionRef('kotlin')
-            library('kotlin-test', 'org.jetbrains.kotlin:kotlin-test:1.7.0')
+            library('kotlin-test', 'org.jetbrains.kotlin', 'kotlin-test').versionRef('kotlin')
+            library('kotlin-bom', 'org.jetbrains.kotlin', 'kotlin-bom').versionRef('kotlin')
             library('kotlinpoet', 'com.squareup:kotlinpoet:1.12.0')
             library('ksp', 'com.google.devtools.ksp', 'symbol-processing-api').versionRef('ksp')
             library('ksp-autoservice', 'dev.zacsweers.autoservice:auto-service-ksp:1.0.0')