Skip to content

Commit b1b51f4

Browse files
committed
Update instrumentation to use Compose Compiler
This is required from Kotlin 2.x
1 parent 52c9cdb commit b1b51f4

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ object libs {
1313
const val androidXTestCore = "1.6.1"
1414
const val androidXTestMonitor = "1.7.2"
1515
const val androidXTestRunner = "1.6.2"
16-
const val composeCompiler = "1.5.15"
1716

1817
const val activityCompose = "1.10.1"
1918
const val apiGuardian = "1.1.2"
@@ -33,6 +32,7 @@ object libs {
3332

3433
object plugins {
3534
fun android(version: SupportedAgp) = "com.android.tools.build:gradle:${version.version}"
35+
const val composeCompiler = "org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:${versions.kotlin}"
3636
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin}"
3737
const val shadow = "com.github.johnrengelman:shadow:${libs.versions.shadow}"
3838
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${libs.versions.dokka}"

instrumentation/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ buildscript {
77
dependencies {
88
classpath(libs.plugins.kotlin)
99
classpath(libs.plugins.dokka)
10+
classpath(libs.plugins.composeCompiler)
1011
classpath(libs.plugins.android(SupportedAgp.newestStable))
1112
}
1213
}

instrumentation/compose/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
kotlin("android")
77
id("explicit-api-mode")
88
id("de.mannodermaus.android-junit5").version(Artifacts.Plugin.latestStableVersion)
9+
id("org.jetbrains.kotlin.plugin.compose")
910
}
1011

1112
val javaVersion = JavaVersion.VERSION_11
@@ -36,10 +37,6 @@ android {
3637
jvmTarget = javaVersion.toString()
3738
}
3839

39-
composeOptions {
40-
kotlinCompilerExtensionVersion = libs.versions.composeCompiler
41-
}
42-
4340
testOptions {
4441
unitTests.isReturnDefaultValues = true
4542
targetSdk = Android.targetSdkVersion

0 commit comments

Comments
 (0)