chore: downgrade Kotlin to 1.8.20 and compose libs to compatible version

adrielcafe · Jan 9, 2024 · 2b966e9 · 2b966e9
1 parent 6d676b1
commit 2b966e9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/android-module.gradle b/android-module.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdk 34
+    compileSdk 33
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 33
         versionCode 1
         versionName "1.0"
     }
@@ -30,4 +30,17 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+}
+
+kotlin {
+    jvmToolchain(8)
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
 }
diff --git a/buildSrc/src/main/kotlin/Setup.kt b/buildSrc/src/main/kotlin/Setup.kt
@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import com.android.build.gradle.LibraryExtension
 
 private fun BaseExtension.android() {
-    compileSdkVersion(34)
+    compileSdkVersion(33)
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
     }
@@ -27,7 +27,7 @@ fun Project.kotlinMultiplatform(
                 explicitApi()
             }
 
-            androidTarget {
+            android {
                 if (project.plugins.hasPlugin("com.vanniktech.maven.publish")) {
                     publishLibraryVariants("release")
                 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,18 +3,18 @@ plugin-android = "8.1.2"
 plugin-ktlint = "11.6.1"
 plugin-maven = "0.22.0"
 
-kotlin = "1.9.10"
+kotlin = "1.8.20"
 
 coroutines = "1.7.3"
-ksp = "1.9.10-1.0.13"
+ksp = "1.8.20-1.0.10"
 caseFormat = "0.2.0"
 konsumeXml = "1.0"
 
-appCompat = "1.6.1"
-compose = "1.5.4"
-composeCompiler = "1.5.3"
-composeActivity = "1.8.0"
-composeMultiplatform = "1.5.3"
+appCompat = "1.5.1"
+compose = "1.4.3"
+composeCompiler = "1.4.6"
+composeActivity = "1.7.2"
+composeMultiplatform = "1.4.1"
 
 test-junit = "1.1.5"