Skip to content

Commit 1d99309

Browse files
committed
checks fix
1 parent 1438da0 commit 1d99309

File tree

4 files changed

+14
-17
lines changed

4 files changed

+14
-17
lines changed

samples/cm-resources-sample/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.multiplatform).apply(false)
33
alias(libs.plugins.compose).apply(false)
4+
alias(libs.plugins.compose.compiler).apply(false)
45
alias(libs.plugins.android.application).apply(false)
56
}
67

samples/cm-resources-sample/composeApp/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import com.android.build.api.dsl.ManagedVirtualDevice
22
import org.jetbrains.compose.ExperimentalComposeLibrary
33
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
44
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
5-
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
65
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
76

87
plugins {
98
alias(libs.plugins.multiplatform)
109
alias(libs.plugins.compose)
1110
alias(libs.plugins.android.application)
1211
id("dev.icerock.mobile.multiplatform-resources")
12+
id("org.jetbrains.kotlin.plugin.compose")
1313
}
1414

1515
kotlin {
@@ -37,11 +37,6 @@ kotlin {
3737
browser()
3838
binaries.executable()
3939
}
40-
@OptIn(ExperimentalWasmDsl::class)
41-
wasmJs {
42-
browser()
43-
binaries.executable()
44-
}
4540

4641
listOf(
4742
iosX64(),
@@ -99,7 +94,7 @@ kotlin {
9994

10095
android {
10196
namespace = "com.icerock.cm.sample.app"
102-
compileSdk = 34
97+
compileSdk = 35
10398

10499
defaultConfig {
105100
minSdk = 24
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
22

3-
kotlin = "1.9.23"
4-
compose = "1.6.10-rc01"
5-
agp = "8.3.1"
6-
androidx-activityCompose = "1.8.2"
3+
kotlin = "2.1.21"
4+
compose = "1.8.1"
5+
agp = "8.9.3"
6+
androidx-activityCompose = "1.10.1"
77
androidx-uiTest = "1.6.4"
88

99
[libraries]
@@ -16,4 +16,5 @@ androidx-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref =
1616

1717
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
1818
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
19-
android-application = { id = "com.android.application", version.ref = "agp" }
19+
android-application = { id = "com.android.application", version.ref = "agp" }
20+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

samples/ios-cocoapods-static-framework/gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
1212

1313
#Android
1414
android.useAndroidX=true
15-
android.compileSdk=34
16-
android.targetSdk=34
15+
android.compileSdk=35
16+
android.targetSdk=35
1717
android.minSdk=24
1818

1919
#Compose
2020

2121
#Versions
22-
kotlin.version=1.9.21
23-
agp.version=8.2.2
24-
compose.version=1.5.11
22+
kotlin.version=2.1.21
23+
agp.version=8.9.3
24+
compose.version=1.8.1
2525

2626
#Moko
2727
moko.resources.disableStaticFrameworkWarning=false

0 commit comments

Comments
 (0)