Skip to content

Commit 58366db

Browse files
committed
Fix default-hierarchy-gallery-mobile build
1 parent fa55fa2 commit 58366db

5 files changed

Lines changed: 21 additions & 16 deletions

File tree

samples/default-hierarchy-gallery-mobile/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ buildscript {
1515
}
1616
dependencies {
1717
classpath(moko.resourcesGradlePlugin)
18-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
19-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.5.11")
20-
classpath("com.android.tools.build:gradle:8.1.4")
18+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
19+
classpath("org.jetbrains.compose:compose-gradle-plugin:1.8.2")
20+
classpath("com.android.tools.build:gradle:8.11.0")
2121
}
2222
}
2323

2424
subprojects {
2525
plugins.withType<com.android.build.gradle.BasePlugin> {
2626
configure<BaseExtension> {
27-
defaultConfig.minSdk = 16
27+
defaultConfig.minSdk = 19
2828
compileSdkVersion(33)
2929

3030
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_17
32-
targetCompatibility = JavaVersion.VERSION_17
31+
sourceCompatibility = JavaVersion.VERSION_21
32+
targetCompatibility = JavaVersion.VERSION_21
3333
}
3434
}
3535
}
3636
plugins.withType<KotlinPluginWrapper> {
3737
configure<KotlinProjectExtension> {
38-
jvmToolchain(17)
38+
jvmToolchain(21)
3939
}
4040
}
4141
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Mon May 06 16:40:02 KRAT 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
55
networkTimeout=10000
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

samples/default-hierarchy-gallery-mobile/mpp-library/mpp_library.podspec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
2222
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2323
end
2424

25+
spec.xcconfig = {
26+
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
27+
}
28+
2529
spec.pod_target_xcconfig = {
2630
'KOTLIN_PROJECT_PATH' => ':mpp-library',
2731
'PRODUCT_MODULE_NAME' => 'MultiPlatformLibrary',

samples/default-hierarchy-gallery-mobile/mpp-library/test-utils/build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@ kotlin {
1818
sourceSets {
1919
val commonMain by getting {
2020
dependencies {
21-
api("org.jetbrains.kotlin:kotlin-test:1.9.21")
22-
api("org.jetbrains.kotlin:kotlin-test-annotations-common:1.9.21")
23-
api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
21+
api("org.jetbrains.kotlin:kotlin-test:2.2.0")
22+
api("org.jetbrains.kotlin:kotlin-test-annotations-common:2.2.0")
23+
api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2")
2424
api(moko.resourcesTest)
2525
}
2626
}
2727

2828
val androidMain by getting {
2929
dependencies {
30-
api("org.jetbrains.kotlin:kotlin-test-junit:1.9.21")
31-
api("androidx.test:core:1.5.0")
32-
api("org.robolectric:robolectric:4.10.3")
30+
api("org.jetbrains.kotlin:kotlin-test-junit:2.2.0")
31+
api("androidx.test:core:1.6.1")
32+
api("org.robolectric:robolectric:4.15.1")
3333
api("junit:junit:4.13.2")
34+
api("androidx.test.ext:junit:1.2.1")
3435
}
3536
}
3637
}

samples/default-hierarchy-gallery-mobile/mpp-library/test-utils/src/androidMain/kotlin/BaseUnitTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
import androidx.test.ext.junit.runners.AndroidJUnit4
56
import org.junit.runner.RunWith
6-
import org.robolectric.RobolectricTestRunner
77
import org.robolectric.annotation.Config
88

9-
@RunWith(RobolectricTestRunner::class)
9+
@RunWith(AndroidJUnit4::class)
1010
@Config(sdk = [33])
1111
public actual abstract class BaseUnitTest

0 commit comments

Comments
 (0)