Skip to content

Commit 797e0c8

Browse files
Opt out of built-in Kotlin until Google fixes Compose
1 parent e320cb3 commit 797e0c8

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33

44
plugins {
55
alias(libs.plugins.com.android.application)
6+
alias(libs.plugins.org.jetbrains.kotlin.android)
67
alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
78
}
89

@@ -95,6 +96,11 @@ android {
9596
lintConfig = file("lint.xml")
9697
}
9798

99+
kotlin {
100+
compilerOptions {
101+
jvmTarget = JvmTarget.JVM_17
102+
}
103+
}
98104
compileOptions {
99105
encoding = "UTF-8"
100106

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
plugins {
44
alias(libs.plugins.com.android.application) apply false
5+
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
56
}
67

78
allprojects {

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1414
# AndroidX package structure to make it clearer which packages are bundled with the
1515
# Android operating system, and which are packaged with your app's APK
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
17+
android.builtInKotlin=false
18+
android.newDsl=false

gradle/libs.versions.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[versions]
22
# AndroidX
33
compose = "2026.03.00"
4+
kotlin = "2.3.20"
45

56
# Third-party
67
acra = "5.13.1"
@@ -52,8 +53,9 @@ junit-junit = { group = "junit", name = "junit", version = "4.13.2" }
5253
org-robolectric-robolectric = { group = "org.robolectric", name = "robolectric", version = "4.16.1" }
5354

5455
[plugins]
55-
com-android-application = { id = "com.android.application", version = "9.0.1" }
56-
org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.3.10" }
56+
com-android-application = { id = "com.android.application", version = "9.1.0" }
57+
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
58+
org-jetbrains-kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
5759

5860
[bundles]
5961
acra = ["ch-acra-acra-mail", "ch-acra-acra-dialog"]

0 commit comments

Comments
 (0)