Merge pull request #48 from icerockdev/#47-update-moko-resources

#47 update moko-resources dependency

Author: Alex009

errors/build.gradle.kts

@@ -2,6 +2,8 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import dev.icerock.gradle.tasks.GenerateMultiplatformResourcesTask
+
 plugins {
     id("dev.icerock.moko.gradle.multiplatform.mobile")
     id("kotlin-parcelize")
@@ -14,6 +16,10 @@ plugins {
 group = "dev.icerock.moko"
 version = libs.versions.mokoErrorsVersion.get()
 
+android {
+    namespace = "dev.icerock.moko.errors"
+}
+
 dependencies {
     commonMainImplementation(libs.coroutines)
 
@@ -28,3 +34,6 @@ multiplatformResources {
     multiplatformResourcesPackage = "dev.icerock.moko.errors"
 }
 
+tasks.withType<GenerateMultiplatformResourcesTask>().configureEach {
+    tasks.getByName("sourcesJar").dependsOn(this)
+}

errors/src/androidMain/AndroidManifest.xml

@@ -28,7 +28,7 @@ class AlertDialogFragment : DialogFragment() {
                 .setMessage(settings.messageText)
                 .setPositiveButton(settings.positiveButtonText) { _, _ -> }
                 .create()
-        } ?: throw IllegalStateException("Activity can't be null.")
+        } ?: error("Activity can't be null.")
     }
 
     @Parcelize

errors/src/androidMain/kotlin/dev/icerock/moko/errors/presenters/AlertDialogFragment.kt

@@ -39,13 +39,14 @@ internal class ExceptionHandlerContextImpl<T : Any, R>(
     override suspend fun execute(): HandlerResult<R, Throwable> {
         return try {
             HandlerResult.Success(block())
-        } catch (e: Exception) {
+        } catch (e: CancellationException) {
             // Don't handle coroutines CancellationException
-            if (e is CancellationException) throw e
+            throw e
+        } catch (e: Exception) {
             onCatch?.invoke(e)
-            val isHandled = isHandledByCustomCatcher(e)
+            val isHandled: Boolean = isHandledByCustomCatcher(e)
             if (!isHandled) { // If not handled by a custom catcher
-                val errorValue = exceptionMapper(e)
+                val errorValue: T = exceptionMapper(e)
                 eventsDispatcher.dispatchEvent {
                     showError(e, errorValue)
                 }

errors/src/commonMain/kotlin/dev/icerock/moko/errors/handler/ExceptionHandlerContextImpl.kt

@@ -4,9 +4,9 @@
 
 package dev.icerock.moko.errors.presenters
 
+import dev.icerock.moko.errors.MR
 import dev.icerock.moko.resources.desc.StringDesc
 import dev.icerock.moko.resources.desc.desc
-import dev.icerock.moko.errors.MR
 
 /**
  * In iOS there is no such thing as snackbar, so it shows [AlertErrorPresenter].

errors/src/iosMain/kotlin/dev/icerock/moko/errors/presenters/SnackBarErrorPresenter.kt

@@ -3,14 +3,12 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
 
 android.useAndroidX=true
 
-moko.android.targetSdk=30
-moko.android.compileSdk=30
+moko.android.targetSdk=33
+moko.android.compileSdk=33
 moko.android.minSdk=16
 
 moko.publish.name=MOKO errors

gradle.properties

@@ -1,13 +1,13 @@
 [versions]
-kotlinVersion = "1.6.10"
+kotlinVersion = "1.8.10"
 androidAppCompatVersion = "1.2.0"
 materialDesignVersion = "1.4.0"
 androidLifecycleVersion = "2.1.0"
 androidCoreTestingVersion = "2.1.0"
 coroutinesVersion = "1.6.0-native-mt"
-mokoMvvmVersion = "0.12.0"
-mokoResourcesVersion = "0.18.0"
-mokoErrorsVersion = "0.6.0"
+mokoMvvmVersion = "0.16.0"
+mokoResourcesVersion = "0.21.2"
+mokoErrorsVersion = "0.7.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.0.4" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.4.2" }
 mokoResourcesGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" }
-mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.1.0" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.3.0" }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -11,6 +11,8 @@ plugins {
 android {
     buildFeatures.dataBinding = true
 
+    namespace = "com.icerockdev"
+
     defaultConfig {
         applicationId = "dev.icerock.moko.samples.errors"
 

sample/android-app/build.gradle.kts

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.icerockdev">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -10,7 +9,9 @@
         android:theme="@style/Theme.AppCompat.DayNight"
         tools:ignore="GoogleAppIndexingWarning">
 
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

sample/android-app/src/main/AndroidManifest.xml

@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: e8746dc30e9d53a96c59e8f821148cde03ea8c5b
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

sample/ios-app/Podfile.lock

@@ -13,6 +13,10 @@ plugins {
     id("dev.icerock.moko.gradle.detekt")
 }
 
+android {
+    namespace = "com.icerockdev.library"
+}
+
 dependencies {
     commonMainImplementation(libs.coroutines)