Skip to content

Commit 0ee5d17

Browse files
committed
1 parent 0c175a8 commit 0ee5d17

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

app/build.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id("com.android.application")
3+
id("org.jetbrains.compose")
34
kotlin("android")
45
}
56

@@ -39,6 +40,13 @@ android {
3940
}
4041
}
4142

43+
// Using Compose gradle plugin v 1.4.1 which supports at most Kotlin 1.8.1
44+
// And SQLDelight 2.0+ which supports at least Kotlin 1.8.2
45+
// Quick workaround until we get some easier to match versions.
46+
compose {
47+
kotlinCompilerPlugin.set("org.jetbrains.compose.compiler:compiler:1.4.8")
48+
}
49+
4250
dependencies {
4351
implementation(project(":shared"))
4452
implementation(libs.bundles.app.ui)

build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ plugins {
99
kotlin("plugin.serialization") version libs.versions.kotlin.get() apply false
1010
id("app.cash.sqldelight") version libs.versions.sqlDelight.get() apply false
1111
id("com.android.library") version libs.versions.android.gradle.plugin.get() apply false
12+
id("org.jetbrains.compose") version libs.versions.compose.gradle.plugin.get() apply(false)
1213
}
1314

1415
allprojects {

gradle.properties

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ kotlin.code.style=official
1717
xcodeproj=./ios
1818
# New Android source-set layout
1919
kotlin.mpp.androidSourceSetLayoutVersion=2
20+
21+
# Compose Multiplatform
22+
org.jetbrains.compose.experimental.uikit.enabled=true
23+
kotlin.native.cacheKind=none

gradle/libs.versions.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "1.8.21"
2+
kotlin = "1.8.22"
33

44
## SDK Versions
55
minSdk = "21"
@@ -8,11 +8,12 @@ compileSdk = "33"
88

99
# Dependencies
1010
android-gradle-plugin = "7.4.2"
11+
compose-gradle-plugin = "1.4.1"
1112
ktlint-gradle = "11.4.2"
1213
gradle-versions = "0.47.0"
1314

1415
compose = "1.4.3"
15-
composeCompiler = "1.4.7"
16+
composeCompiler = "1.4.8"
1617

1718
android-desugaring = "2.0.3"
1819
androidx-core = "1.10.1"

shared/build.gradle.kts

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
kotlin("native.cocoapods")
66
kotlin("plugin.serialization")
77
id("com.android.library")
8+
id("org.jetbrains.compose")
89
id("app.cash.sqldelight")
910
}
1011

@@ -46,6 +47,7 @@ kotlin {
4647

4748
val commonMain by getting {
4849
dependencies {
50+
implementation(compose.runtime)
4951
implementation(libs.koin.core)
5052
implementation(libs.coroutines.core)
5153
implementation(libs.sqlDelight.coroutinesExt)
@@ -62,6 +64,7 @@ kotlin {
6264
}
6365
val androidMain by getting {
6466
dependencies {
67+
implementation(libs.compose.activity)
6568
implementation(libs.androidx.lifecycle.viewmodel)
6669
implementation(libs.sqlDelight.android)
6770
implementation(libs.ktor.client.okHttp)
@@ -106,6 +109,13 @@ kotlin {
106109
}
107110
}
108111

112+
// Using Compose gradle plugin v 1.4.1 which supports at most Kotlin 1.8.1
113+
// And SQLDelight 2.0+ which supports at least Kotlin 1.8.2
114+
// Quick workaround until we get some easier to match versions.
115+
compose {
116+
kotlinCompilerPlugin.set("org.jetbrains.compose.compiler:compiler:1.4.8")
117+
}
118+
109119
sqldelight {
110120
databases.create("KaMPKitDb") {
111121
packageName.set("co.touchlab.kampkit.db")

0 commit comments

Comments
 (0)