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

#51 update moko resources

.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 {

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

@@ -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
 

gradle.properties

@@ -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

gradle/libs.versions.toml

@@ -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" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Apr 16 13:01:03 NOVT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

local-check.sh

@@ -0,0 +1,37 @@
+#
+# Copyright 2024 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+#
+
+set -e
+
+log() {
+  echo "\033[0;32m> $1\033[0m"
+}
+
+./gradlew detekt
+log "detekt success"
+
+./gradlew assembleDebug
+log "android success"
+
+./gradlew compileKotlinIosX64
+log "ios success"
+
+./gradlew build publishToMavenLocal
+log "full build success"
+
+if ! command -v xcodebuild &> /dev/null
+then
+    log "xcodebuild could not be found, skip ios checks"
+else
+    ./gradlew syncMultiPlatformLibraryDebugFrameworkIosX64
+    log "sync success"
+
+    (
+    cd sample/ios-app &&
+    pod install &&
+    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
+    )
+    log "ios xcode success"
+fi

sample/ios-app/Podfile.lock

@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../mpp-library"
 
 SPEC CHECKSUMS:
-  MultiPlatformLibrary: 2a9f43df7bd018c32611a2087c1e2ef74847394c
+  MultiPlatformLibrary: 050151f1b2e9b2dcfff0763bb625fb3a0a063076
 
 PODFILE CHECKSUM: e8746dc30e9d53a96c59e8f821148cde03ea8c5b
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2

sample/ios-app/TestProj.xcodeproj/project.pbxproj

@@ -112,7 +112,7 @@
 				287627FB1F319065007FA12B /* Sources */,
 				287627FC1F319065007FA12B /* Frameworks */,
 				287627FD1F319065007FA12B /* Resources */,
-				587327CC3950A42DF058CD2B /* [CP] Embed Pods Frameworks */,
+				C2E24025FF3D3E83F431EA5B /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -173,7 +173,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		587327CC3950A42DF058CD2B /* [CP] Embed Pods Frameworks */ = {
+		C2E24025FF3D3E83F431EA5B /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

sample/mpp-library/MultiPlatformLibrary.podspec

@@ -19,7 +19,6 @@ Pod::Spec.new do |spec|
         'KOTLIN_FRAMEWORK_BUILD_TYPE[config=*elease]' => 'release',
         'CURENT_SDK[sdk=iphoneos*]' => 'iphoneos',
         'CURENT_SDK[sdk=iphonesimulator*]' => 'iphonesimulator',
-        'CURENT_SDK[sdk=macosx*]' => 'macos'
     }
 
     spec.script_phases = [
@@ -37,21 +36,17 @@ fi
 if [ "$CURENT_SDK" == "iphoneos" ]; then
   TARGET="Ios"
   ARCH="Arm64"
-elif [ "$CURENT_SDK" == "macos" ]; then
-  TARGET="Macos"
-  if [ "$NATIVE_ARCH" == "arm64" ]; then
-    ARCH="Arm64"
-  else
-    ARCH="X64"
-  fi
-else
-  if [ "$NATIVE_ARCH" == "arm64" ]; then
+elif [ "$CURENT_SDK" == "iphonesimulator" ]; then
+  if [ "$ARCHS" == "arm64" ]; then
     TARGET="IosSimulator"
     ARCH="Arm64"
   else
     TARGET="Ios"
     ARCH="X64"
   fi
+else
+  echo "unsupported $CURENT_SDK"
+  exit 1
 fi
 
 MPP_PROJECT_ROOT="$SRCROOT/../../mpp-library"

sample/mpp-library/build.gradle.kts

@@ -29,5 +29,5 @@ dependencies {
 }
 
 multiplatformResources {
-    multiplatformResourcesPackage = "com.icerockdev.library"
+    resourcesPackage.set("com.icerockdev.library")
 }

settings.gradle.kts

@@ -2,7 +2,6 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {