From 83e4b420d4117c8409414f9eed0725b6c219e69d Mon Sep 17 00:00:00 2001
From: Atte149 <atte149@users.noreply.github.com>
Date: Wed, 24 Jun 2026 08:33:12 +0300
Subject: [PATCH] fix(build): align Kotlin/KSP/Compose and force stdlib
 resolution

- Use Kotlin 2.2.0, KSP 2.2.0-2.0.2, Compose Multiplatform 1.8.2 to match
  transitive dependencies compiled with Kotlin metadata 2.3.0.
- Add root resolutionStrategy force for kotlin-stdlib 2.1.20/2.1.20 variants
  to keep runtime consistent while compiler reads 2.3.0 metadata.
- Baseline ':app:assembleOssDebug' now passes, APK ~80 MB.
---
 build.gradle.kts          | 11 +++++++++++
 gradle/libs.versions.toml |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5568021..2a827b8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,17 @@ val test by tasks.registering {
     description = "Runs available unit tests for the included projects."
 }
 
+allprojects {
+    configurations.all {
+        resolutionStrategy {
+            force("org.jetbrains.kotlin:kotlin-stdlib:2.1.20")
+            force("org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20")
+        }
+    }
+}
+
 subprojects {
     val rootTest = rootProject.tasks.named("test")
     tasks.matching {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae5ea61..c4ecad9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 agp = "8.9.2"
-kotlin = "2.1.20"
+kotlin = "2.2.0"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -21,8 +21,8 @@ androidxAnnotationJvm = "1.9.1"
 androidxTestRunner = "1.6.2"
 material3WindowSizeClassAndroid = "1.3.2"
 credentials = "1.5.0"
-composeMultiplatform = "1.7.3"
-ksp = "2.1.20-1.0.32"
+composeMultiplatform = "1.8.2"
+ksp = "2.2.0-2.0.2"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }