diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bb4f2c7..edba5ef 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,9 +26,12 @@ jobs: with: java-version: 17 distribution: zulu + - name: Prebuild library + run: ./gradlew publishToMavenLocal - name: Publish -# gradle configuration cache not supported in https://github.com/gradle-nexus/publish-plugin - run: ./gradlew publish --no-configuration-cache + # Publish plugin lacks configuration cache support: + # https://github.com/gradle-nexus/publish-plugin/issues/221 + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-configuration-cache release: name: Create release diff --git a/.gitignore b/.gitignore index 77fd544..ac3b359 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .gradle +.kotlin .settings .project .classpath diff --git a/README.md b/README.md index 80518da..8a86876 100755 --- a/README.md +++ b/README.md @@ -27,7 +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 +- Kotlin 2.1.0 - Gradle version 6.8+ - Android API 16+ - iOS version 11.0+ @@ -45,7 +45,7 @@ allprojects { project build.gradle ```groovy dependencies { - commonMainApi("dev.icerock.moko:errors:0.8.0") + commonMainApi("dev.icerock.moko:errors:0.9.0") } ``` diff --git a/errors/build.gradle.kts b/errors/build.gradle.kts index dfbc66e..25ca4ed 100644 --- a/errors/build.gradle.kts +++ b/errors/build.gradle.kts @@ -20,6 +20,12 @@ android { namespace = "dev.icerock.moko.errors" } +kotlin { + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } +} + dependencies { commonMainImplementation(libs.coroutines) diff --git a/gradle.properties b/gradle.properties index 79b9edf..5aa2d2c 100755 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,9 @@ moko.android.targetSdk=33 moko.android.compileSdk=33 moko.android.minSdk=16 +mobile.multiplatform.useIosShortcut=false +moko.resources.disableStaticFrameworkWarning=true + moko.publish.name=MOKO errors moko.publish.description=Automated exceptions handler for mobile (android & ios) Kotlin Multiplatform development. moko.publish.repo.org=icerockdev diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 471adf6..c593c2e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -kotlinVersion = "1.9.25" +kotlinVersion = "2.1.0" androidAppCompatVersion = "1.6.1" materialDesignVersion = "1.8.0" androidLifecycleVersion = "2.2.0" androidCoreTestingVersion = "2.2.0" coroutinesVersion = "1.6.4" mokoMvvmVersion = "0.16.1" -mokoResourcesVersion = "0.24.1" -mokoErrorsVersion = "0.8.0" +mokoResourcesVersion = "0.26.0" +mokoErrorsVersion = "0.9.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 = "8.3.2" } +androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.4.0" } mokoResourcesGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" } -mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.4.2" } +mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.6.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7467e60..aebdd27 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Tue Apr 16 13:01:03 NOVT 2024 +#Tue Feb 10 14:55:08 NOVT 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sample/ios-app/Podfile.lock b/sample/ios-app/Podfile.lock index 12cb0fb..479fccf 100644 --- a/sample/ios-app/Podfile.lock +++ b/sample/ios-app/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: e8746dc30e9d53a96c59e8f821148cde03ea8c5b -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2