File tree Expand file tree Collapse file tree
samples/compose-resources-gallery Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ kotlin {
1919}
2020
2121android {
22- compileSdk = 34
22+ compileSdk = 36
2323 defaultConfig {
2424 applicationId = " com.myapplication.MyApplication"
2525 minSdk = 26
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ plugins {
44 kotlin(" jvm" ) apply false
55 kotlin(" multiplatform" ) apply false
66 kotlin(" android" ) apply false
7+ kotlin(" plugin.compose" ) apply false
78 id(" com.android.application" ) apply false
89 id(" com.android.library" ) apply false
910 id(" org.jetbrains.compose" ) apply false
Original file line number Diff line number Diff line change @@ -20,6 +20,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
2020kotlin.mpp.androidGradlePluginCompatibility.nowarn =true
2121
2222# update to future versions after fix of https://youtrack.jetbrains.com/issue/CMP-7207
23- kotlin.version =2.1 .0
23+ kotlin.version =2.2 .0
2424agp.version =8.4.0
25- compose.version =1.6.10
25+ compose.version =1.8.2
Original file line number Diff line number Diff line change @@ -2745,11 +2745,6 @@ type-is@~1.6.18:
27452745 media-typer "0.3.0"
27462746 mime-types "~2.1.24"
27472747
2748- typescript@5.5.4 :
2749- version "5.5.4"
2750- resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
2751- integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
2752-
27532748ua-parser-js@^0.7.30 :
27542749 version "0.7.34"
27552750 resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.34.tgz#afb439e2e3e394bdc90080acb661a39c685b67d7"
Original file line number Diff line number Diff line change 11
2+ import dev.icerock.gradle.data.ExtractingBaseLibraryImpl
23import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
34import java.io.File
45
@@ -84,7 +85,7 @@ tasks.withType<KotlinNativeLink>().configureEach {
8485 klib = klibKonan,
8586 component = " default"
8687 )
87- val layout = klib.extractingToTemp
88+ val layout = ExtractingBaseLibraryImpl ( klib)
8889
8990 // extracting bundles
9091 layout
Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ pluginManagement {
1313 kotlin(" jvm" ).version(kotlinVersion)
1414 kotlin(" multiplatform" ).version(kotlinVersion)
1515 kotlin(" android" ).version(kotlinVersion)
16+ kotlin(" plugin.compose" ).version(kotlinVersion)
1617 id(" com.android.base" ).version(agpVersion)
1718 id(" com.android.application" ).version(agpVersion)
1819 id(" com.android.library" ).version(agpVersion)
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ kotlin {
7171}
7272
7373android {
74- compileSdk = 34
74+ compileSdk = 36
7575 sourceSets[" main" ].manifest.srcFile(" src/androidMain/AndroidManifest.xml" )
7676
7777 defaultConfig {
You can’t perform that action at this time.
0 commit comments