Merge pull request #36 from icerockdev/develop

Release 0.8.0

.github/workflows/compilation-check.yml

@@ -24,5 +24,5 @@ jobs:
         run: cd sample/ios-app && pod install
         if: matrix.os == 'macOS-latest'
       - name: Check iOS
-        run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+        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
         if: matrix.os == 'macOS-latest'

.gitignore

@@ -9,4 +9,5 @@ build
 Pods
 xcuserdata
 local.properties
-local.gradle
+local.gradle
+kotlin-js-store/

README.md

@@ -36,7 +36,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:parcelize:0.7.1")
+    commonMainApi("dev.icerock.moko:parcelize:0.8.0")
 }
 ```
 

build.gradle.kts

@@ -19,3 +19,8 @@ allprojects {
         version = libs.versions.mokoParcelizeVersion.get()
     }
 }
+
+// temporary fix for Apple Silicon (remove after 1.6.20 update)
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
+}

gradle.properties

@@ -9,5 +9,3 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
-
-mobile.multiplatform.iosTargetWarning=false

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 androidAppCompatVersion = "1.2.0"
-mokoParcelizeVersion = "0.7.1"
+mokoParcelizeVersion = "0.8.0"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }

gradle/wrapper/gradle-wrapper.properties

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

parcelize-build-logic/build.gradle.kts

@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    api("dev.icerock:mobile-multiplatform:0.12.0")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
-    api("com.android.tools.build:gradle:4.2.1")
-    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
+    api("dev.icerock:mobile-multiplatform:0.13.0")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+    api("com.android.tools.build:gradle:7.0.4")
+    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0")
 }

parcelize-build-logic/src/main/kotlin/android-app-convention.gradle.kts

@@ -9,10 +9,6 @@ plugins {
 }
 
 android {
-    dexOptions {
-        javaMaxHeapSize = "2g"
-    }
-
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -25,8 +21,8 @@ android {
     }
 
     packagingOptions {
-        exclude("META-INF/*.kotlin_module")
-        exclude("META-INF/AL2.0")
-        exclude("META-INF/LGPL2.1")
+        resources.excludes.add("META-INF/*.kotlin_module")
+        resources.excludes.add("META-INF/AL2.0")
+        resources.excludes.add("META-INF/LGPL2.1")
     }
 }

parcelize-build-logic/src/main/kotlin/detekt-convention.gradle.kts

@@ -2,14 +2,17 @@
  * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import io.gitlab.arturbosch.detekt.Detekt
+
 plugins {
     id("io.gitlab.arturbosch.detekt")
 }
 
-detekt {
-    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
+tasks.register("detektWithoutTests") {
+    group = "verification"
+    dependsOn(tasks.withType<Detekt>().matching { it.name.contains("Test").not() })
 }
 
 dependencies {
-    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
+    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.19.0")
 }

parcelize-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -14,9 +14,13 @@ kotlin {
         publishLibraryVariants("release", "debug")
     }
     ios()
-    macosX64("macOS")
+    iosSimulatorArm64()
+    macosX64()
+    macosArm64()
     tvos()
+    tvosSimulatorArm64()
     watchos()
+    watchosSimulatorArm64()
     jvm()
     js(BOTH) {
         nodejs()

parcelize/build.gradle.kts

@@ -4,6 +4,7 @@
 
 plugins {
     id("multiplatform-library-convention")
+    id("detekt-convention")
     id("kotlin-parcelize")
     id("dev.icerock.mobile.multiplatform.android-manifest")
     id("publication-convention")

parcelize/src/androidMain/kotlin/dev/icerock/moko/parcelize/Parcelize.kt

@@ -12,4 +12,4 @@ actual typealias Parcelize = Parcelize
 
 actual typealias Parcelable = Parcelable
 
-actual typealias IgnoredOnParcel = IgnoredOnParcel
+actual typealias IgnoredOnParcel = IgnoredOnParcel

sample/mpp-library/build.gradle.kts

@@ -14,7 +14,9 @@ plugins {
 
 kotlin {
     ios()
+    iosSimulatorArm64()
     macosX64()
+    macosArm64()
     android()
 }
 

settings.gradle.kts

@@ -9,12 +9,6 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.kotlinx")
-            }
-        }
     }
 }