Merge pull request #52 from ExNDY/#51-update-moko-resources

#51 update moko resources

Author: Alex009

.github/workflows/compilation-check.yml

@@ -11,14 +11,11 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
-    - name: Build and publish local
-      run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
-    - name: Install pods
-      run: cd sample/ios-app && pod install
-    - name: Check iOS
-      run: cd sample/ios-app && set -o pipefail && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+        java-version: 17
+        distribution: zulu
+    - name: Check
+      run: ./local-check.sh

.github/workflows/publish.yml

@@ -20,11 +20,12 @@ jobs:
       SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
+          distribution: zulu
       - name: Publish
         run: ./gradlew publish
 

README.md

@@ -27,6 +27,7 @@ on the platforms. Converts the exception class to an error object to display. Th
 `SelectorErrorPresenter` - for selecting error presenter by some custom condition.
 
 ## Requirements
+- Kotlin 1.9.0
 - Gradle version 6.8+
 - Android API 16+
 - iOS version 11.0+
@@ -44,7 +45,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:errors:0.6.0")
+    commonMainApi("dev.icerock.moko:errors:0.8.0")
 }
 ```
 

build.gradle.kts

@@ -26,5 +26,5 @@ allprojects {
 }
 
 tasks.register("clean", Delete::class).configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }

errors/build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
 }
 
 multiplatformResources {
-    multiplatformResourcesPackage = "dev.icerock.moko.errors"
+    resourcesPackage.set("dev.icerock.moko.errors")
 }
 
 tasks.withType<GenerateMultiplatformResourcesTask>().configureEach {

…commonMain/resources/MR/base/strings.xml …mmonMain/moko-resources/base/strings.xmlerrors/src/commonMain/resources/MR/base/strings.xml renamed to errors/src/commonMain/moko-resources/base/strings.xml errors/src/commonMain/resources/MR/base/strings.xml renamed to errors/src/commonMain/moko-resources/base/strings.xml

@@ -8,6 +8,7 @@ import dev.icerock.moko.errors.ErrorEventListener
 import dev.icerock.moko.errors.presenters.ErrorPresenter
 import dev.icerock.moko.mvvm.dispatcher.EventsDispatcher
 import platform.UIKit.UIViewController
+import kotlin.experimental.ExperimentalNativeApi
 import kotlin.native.ref.WeakReference
 
 actual interface ExceptionHandlerBinder {
@@ -33,8 +34,10 @@ actual class ExceptionHandlerBinderImpl<T : Any> actual constructor(
         viewController: UIViewController,
         private val errorPresenter: ErrorPresenter<T>
     ) : ErrorEventListener<T> {
+        @OptIn(ExperimentalNativeApi::class)
         private val viewControllerRef = WeakReference(viewController)
 
+        @OptIn(ExperimentalNativeApi::class)
         override fun showError(throwable: Throwable, data: T) {
             val viewController = viewControllerRef.get() ?: return
 

…c/commonMain/resources/MR/ru/strings.xml …commonMain/moko-resources/ru/strings.xmlerrors/src/commonMain/resources/MR/ru/strings.xml renamed to errors/src/commonMain/moko-resources/ru/strings.xml errors/src/commonMain/resources/MR/ru/strings.xml renamed to errors/src/commonMain/moko-resources/ru/strings.xml

@@ -1,6 +1,7 @@
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.configureondemand=false
 org.gradle.parallel=true
+org.gradle.configuration-cache=true
 
 kotlin.code.style=official
 kotlin.mpp.androidSourceSetLayoutVersion=2

errors/src/iosMain/kotlin/dev/icerock/moko/errors/handler/ExceptionHandlerBinder.kt

@@ -1,13 +1,13 @@
 [versions]
-kotlinVersion = "1.8.10"
+kotlinVersion = "1.9.25"
 androidAppCompatVersion = "1.6.1"
 materialDesignVersion = "1.8.0"
 androidLifecycleVersion = "2.2.0"
 androidCoreTestingVersion = "2.2.0"
 coroutinesVersion = "1.6.4"
-mokoMvvmVersion = "0.16.0"
-mokoResourcesVersion = "0.21.2"
-mokoErrorsVersion = "0.7.0"
+mokoMvvmVersion = "0.16.1"
+mokoResourcesVersion = "0.24.1"
+mokoErrorsVersion = "0.8.0"
 
 [libraries]
 # android
@@ -30,6 +30,6 @@ androidCoreTesting = { module = "androidx.arch.core:core-testing", version.ref =
 
 # gradle plugins
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
-androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.4.2" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.3.2" }
 mokoResourcesGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" }
-mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.3.0" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.4.1" }