#224 default error text

gradle.properties

@@ -11,6 +11,8 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false
 android.useAndroidX=true
 
 mobile.multiplatform.iosTargetWarning=false
+mobile.multiplatform.useIosShortcut=false
+moko.resources.disableStaticFrameworkWarning=true
 
 xcodeproj=./sample/ios-app
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlinVersion = "2.0.20"
+kotlinVersion = "2.1.0"
 
 # android
 lifecycleViewModelVersion = "2.6.1"
@@ -16,11 +16,11 @@ kotlinxSerializationVersion = "1.7.3"
 coroutinesVersion = "1.9.0"
 
 # moko
-mokoResourcesVersion = "0.24.4"
+mokoResourcesVersion = "0.26.0"
 mokoMvvmVersion = "0.16.0"
-mokoErrorsVersion = "0.7.0"
+mokoErrorsVersion = "0.9.0"
 mokoTestVersion = "0.6.1"
-mokoNetworkVersion = "0.22.0"
+mokoNetworkVersion = "0.23.0"
 
 # tests
 espressoCoreVersion = "3.5.1"

network-bignum/build.gradle.kts

@@ -15,6 +15,10 @@ android {
 
 kotlin {
     jvm()
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 }
 
 dependencies {

network-engine/build.gradle.kts

@@ -35,6 +35,10 @@ kotlin {
             dependsOn(commonJvmAndroid)
         }
     }
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 }
 
 dependencies {

network-errors/build.gradle.kts

@@ -14,6 +14,12 @@ android {
     namespace = "dev.icerock.moko.network.errors"
 }
 
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+}
+
 dependencies {
     commonMainImplementation(libs.kotlinSerialization)
 

network-errors/src/commonMain/kotlin/dev/icerock/moko/network/errors/NetworkErrorsTexts.kt

@@ -5,8 +5,10 @@
 package dev.icerock.moko.network.errors
 
 import dev.icerock.moko.resources.StringResource
+import dev.icerock.moko.errors.MR as ErrorsMR
 
 data class NetworkErrorsTexts(
+    val defaultErrorText: StringResource = ErrorsMR.strings.moko_errors_unknownError,
     val networkConnectionErrorText: StringResource = MR.strings.networkConnectionErrorText,
     val serializationErrorText: StringResource = MR.strings.serializationErrorText,
     val httpNetworkErrorsTexts: HttpNetworkErrorsTexts = HttpNetworkErrorsTexts(),

network-errors/src/commonMain/kotlin/dev/icerock/moko/network/errors/NetworkExceptionMappers.kt

@@ -4,14 +4,14 @@
 
 package dev.icerock.moko.network.errors
 
-import dev.icerock.moko.errors.MR
 import dev.icerock.moko.errors.mappers.ExceptionMappersStorage
 import dev.icerock.moko.network.SSLExceptionType
 import dev.icerock.moko.network.exceptions.ErrorException
 import dev.icerock.moko.network.exceptions.ValidationException
 import dev.icerock.moko.network.getSSLExceptionType
 import dev.icerock.moko.network.isNetworkConnectionError
 import dev.icerock.moko.network.isSSLException
+import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.CompositionStringDesc
 import dev.icerock.moko.resources.desc.ResourceFormatted
 import dev.icerock.moko.resources.desc.StringDesc
@@ -36,6 +36,7 @@ fun ExceptionMappersStorage.registerAllNetworkMappers(
         mapper = {
             getSSLExceptionStringDescMapper(
                 sslException = it,
+                defaultErrorText = errorsTexts.defaultErrorText,
                 sslNetworkErrorsTexts = errorsTexts.sslNetworkErrorsTexts
             )
         }
@@ -45,6 +46,7 @@ fun ExceptionMappersStorage.registerAllNetworkMappers(
     ).register<ErrorException, StringDesc> {
         getNetworkErrorExceptionStringDescMapper(
             errorException = it,
+            defaultErrorText = errorsTexts.defaultErrorText,
             httpNetworkErrorsTexts = errorsTexts.httpNetworkErrorsTexts
         )
     }.register(::validationExceptionStringDescMapper)
@@ -55,6 +57,7 @@ fun ExceptionMappersStorage.registerAllNetworkMappers(
  */
 private fun getNetworkErrorExceptionStringDescMapper(
     errorException: ErrorException,
+    defaultErrorText: StringResource,
     httpNetworkErrorsTexts: HttpNetworkErrorsTexts
 ): StringDesc {
     val httpStatusCode = errorException.httpStatusCode
@@ -69,7 +72,7 @@ private fun getNetworkErrorExceptionStringDescMapper(
             )
         }
 
-        else -> MR.strings.moko_errors_unknownError.desc()
+        else -> defaultErrorText.desc()
     }
 }
 
@@ -79,6 +82,7 @@ private fun getNetworkErrorExceptionStringDescMapper(
 @Suppress("ComplexMethod")
 private fun getSSLExceptionStringDescMapper(
     sslException: Throwable,
+    defaultErrorText: StringResource,
     sslNetworkErrorsTexts: SSLNetworkErrorsTexts
 ): StringDesc {
     return when (sslException.getSSLExceptionType()) {
@@ -90,7 +94,7 @@ private fun getSSLExceptionStringDescMapper(
         SSLExceptionType.ClientCertificateRejected -> sslNetworkErrorsTexts.clientCertificateRejected.desc()
         SSLExceptionType.ClientCertificateRequired -> sslNetworkErrorsTexts.clientCertificateRequired.desc()
         SSLExceptionType.CannotLoadFromNetwork -> sslNetworkErrorsTexts.cannotLoadFromNetwork.desc()
-        else -> MR.strings.moko_errors_unknownError.desc()
+        else -> defaultErrorText.desc()
     }
 }
 

network/build.gradle.kts

@@ -39,6 +39,10 @@ kotlin {
             }
         }
     }
+
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
 }
 
 dependencies {

sample/mpp-library/build.gradle.kts

@@ -10,10 +10,10 @@ plugins {
     id("dev.icerock.moko.gradle.android.base")
     id("org.jetbrains.kotlin.multiplatform")
     id("org.jetbrains.kotlin.plugin.serialization")
-    id("dev.icerock.mobile.multiplatform.targets")
+    id("dev.icerock.moko.gradle.multiplatform.mobile")
+    id("dev.icerock.mobile.multiplatform.ios-framework")
     id("dev.icerock.mobile.multiplatform-resources")
     id("dev.icerock.mobile.multiplatform-network-generator")
-    id("dev.icerock.mobile.multiplatform.ios-framework")
     id("dev.icerock.moko.gradle.detekt")
     id("dev.icerock.moko.gradle.tests")
 }