Skip to content

Commit fa55fa2

Browse files
committed
Fix compose-resources-gallery build
1 parent fffdf4e commit fa55fa2

7 files changed

Lines changed: 8 additions & 10 deletions

File tree

samples/compose-resources-gallery/androidApp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kotlin {
1919
}
2020

2121
android {
22-
compileSdk = 34
22+
compileSdk = 36
2323
defaultConfig {
2424
applicationId = "com.myapplication.MyApplication"
2525
minSdk = 26

samples/compose-resources-gallery/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

samples/compose-resources-gallery/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
2020
kotlin.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
2424
agp.version=8.4.0
25-
compose.version=1.6.10
25+
compose.version=1.8.2

samples/compose-resources-gallery/kotlin-js-store/yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff 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-
27532748
ua-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"

samples/compose-resources-gallery/macosApp/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
import dev.icerock.gradle.data.ExtractingBaseLibraryImpl
23
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink
34
import 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

samples/compose-resources-gallery/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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)

samples/compose-resources-gallery/shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ kotlin {
7171
}
7272

7373
android {
74-
compileSdk = 34
74+
compileSdk = 36
7575
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
7676

7777
defaultConfig {

0 commit comments

Comments
 (0)