Skip to content

Commit 8be1615

Browse files
authored
Merge pull request #55 from ExNDY/#54-update-moko-resources-and-kotlin
#54 update moko resources and kotlin
2 parents 45f94ca + 238addf commit 8be1615

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.gradle
2+
.kotlin
23
.settings
34
.project
45
.classpath

errors/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ android {
2020
namespace = "dev.icerock.moko.errors"
2121
}
2222

23+
kotlin {
24+
compilerOptions {
25+
freeCompilerArgs.add("-Xexpect-actual-classes")
26+
}
27+
}
28+
2329
dependencies {
2430
commonMainImplementation(libs.coroutines)
2531

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ moko.android.targetSdk=33
1212
moko.android.compileSdk=33
1313
moko.android.minSdk=16
1414

15+
mobile.multiplatform.useIosShortcut=false
16+
moko.resources.disableStaticFrameworkWarning=true
17+
1518
moko.publish.name=MOKO errors
1619
moko.publish.description=Automated exceptions handler for mobile (android & ios) Kotlin Multiplatform development.
1720
moko.publish.repo.org=icerockdev

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
kotlinVersion = "1.9.25"
2+
kotlinVersion = "2.1.0"
33
androidAppCompatVersion = "1.6.1"
44
materialDesignVersion = "1.8.0"
55
androidLifecycleVersion = "2.2.0"
66
androidCoreTestingVersion = "2.2.0"
77
coroutinesVersion = "1.6.4"
88
mokoMvvmVersion = "0.16.1"
9-
mokoResourcesVersion = "0.24.1"
10-
mokoErrorsVersion = "0.8.0"
9+
mokoResourcesVersion = "0.26.0"
10+
mokoErrorsVersion = "0.9.0"
1111

1212
[libraries]
1313
# android
@@ -30,6 +30,6 @@ androidCoreTesting = { module = "androidx.arch.core:core-testing", version.ref =
3030

3131
# gradle plugins
3232
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
33-
androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.3.2" }
33+
androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.4.0" }
3434
mokoResourcesGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" }
35-
mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.4.2" }
35+
mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.6.0" }
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Apr 16 13:01:03 NOVT 2024
1+
#Tue Feb 10 14:55:08 NOVT 2026
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

sample/ios-app/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
1313

1414
PODFILE CHECKSUM: e8746dc30e9d53a96c59e8f821148cde03ea8c5b
1515

16-
COCOAPODS: 1.15.2
16+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)