Merge pull request #31 from icerockdev/develop

Release 0.7.1

Author: Alex009

.github/workflows/compilation-check.yml

@@ -14,15 +14,15 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Check build
         run: ./gradlew build publishToMavenLocal
       - name: Install pods
         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 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+        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
         if: matrix.os == 'macOS-latest'

.github/workflows/publish.yml

@@ -23,10 +23,10 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Publish
         run: ./gradlew publish -DIS_MAIN_HOST=${{ matrix.os == 'ubuntu-latest' }}
   release:
@@ -42,6 +42,6 @@ jobs:
         with:
           commitish: ${{ github.ref }}
           tag_name: release/${{ github.event.inputs.version }}
-          release_name: Release ${{ github.event.inputs.version }}
+          release_name: ${{ github.event.inputs.version }}
           body: "Will be filled later"
           draft: true

README.md

@@ -1,13 +1,12 @@
 ![moko-parcelize](img/logo.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/parcelize) ](https://repo1.maven.org/maven2/dev/icerock/moko/parcelize) ![kotlin-version](https://img.shields.io/badge/kotlin-1.5.10-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/parcelize) ](https://repo1.maven.org/maven2/dev/icerock/moko/parcelize) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=parcelize)
 
 # MOKO Parcelize
 This is a Kotlin Multiplatform library that supports Parcelize in common code.  
 
 ## Table of Contents
 - [Features](#features)
 - [Requirements](#requirements)
-- [Versions](#versions)
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
@@ -20,9 +19,9 @@ This is a Kotlin Multiplatform library that supports Parcelize in common code.
 - All Kotlin Multiplatform targets support.
 
 ## Requirements
-- Gradle version 6.0+
+- Gradle version 6.8+
 - Android API 16+
-- iOS version 9.0+
+- iOS version 11.0+
 
 ## Installation
 root build.gradle  
@@ -37,7 +36,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:parcelize:0.7.0")
+    commonMainApi("dev.icerock.moko:parcelize:0.7.1")
 }
 ```
 
@@ -63,6 +62,7 @@ Please see more examples in the [sample directory](sample).
 ## Set Up Locally 
 - The [parcelize directory](parcelize) contains the `parcelize` library;
 - The [sample directory](sample) contains sample apps for Android and iOS; plus the mpp-library connected to the apps.
+- For publish to MavenLocal repository run `./gradlew publishToMavenLocal -DIS_MAIN_HOST=true`
 
 ## Contributing
 All development (both new features and bug fixes) is performed in the `develop` branch. This way `master` always contains the sources of the most recently released version. Please send PRs with bug fixes to the `develop` branch. Documentation fixes in the markdown files are an exception to this rule. They are updated directly in `master`.

build.gradle.kts

@@ -6,28 +6,16 @@ buildscript {
     repositories {
         mavenCentral()
         google()
+        gradlePluginPortal()
     }
     dependencies {
-        classpath("dev.icerock:mobile-multiplatform:0.9.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
-        classpath("com.android.tools.build:gradle:4.2.1")
+        classpath(":parcelize-build-logic")
     }
 }
 
 allprojects {
-    repositories {
-        mavenCentral()
-        google()
-    }
-
-    plugins.withId("com.android.library") {
-        configure<com.android.build.gradle.LibraryExtension> {
-            compileSdkVersion(libs.versions.compileSdk.get().toInt())
-
-            defaultConfig {
-                minSdkVersion(libs.versions.minSdk.get().toInt())
-                targetSdkVersion(libs.versions.targetSdk.get().toInt())
-            }
-        }
+    plugins.withId("org.gradle.maven-publish") {
+        group = "dev.icerock.moko"
+        version = libs.versions.mokoParcelizeVersion.get()
     }
 }

gradle/libs.versions.toml

@@ -1,10 +1,6 @@
 [versions]
-androidAppCompatVersion = "1.1.0"
-mokoParcelizeVersion = "0.7.0"
-compileSdk = "28"
-targetSdk = "28"
-minSdk = "16"
+androidAppCompatVersion = "1.2.0"
+mokoParcelizeVersion = "0.7.1"
 
 [libraries]
-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
-mokoParcelize = { module = "dev.icerock.moko:parcelize", version.ref = "mokoParcelizeVersion" }
+appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }

parcelize-build-logic/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    gradlePluginPortal()
+}
+
+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")
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.application")
+    id("android-base-convention")
+    id("kotlin-android")
+}
+
+android {
+    dexOptions {
+        javaMaxHeapSize = "2g"
+    }
+
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+        getByName("debug") {
+            isDebuggable = true
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    packagingOptions {
+        exclude("META-INF/*.kotlin_module")
+        exclude("META-INF/AL2.0")
+        exclude("META-INF/LGPL2.1")
+    }
+}

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

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import com.android.build.gradle.BaseExtension
+
+configure<BaseExtension> {
+    compileSdkVersion(30)
+
+    defaultConfig {
+        minSdkVersion(16)
+        targetSdkVersion(30)
+    }
+}

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

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("android-base-convention")
+}
+
+android {
+    sourceSets.all { java.srcDir("src/$name/kotlin") }
+}

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("publication-convention")
+}
+
+afterEvaluate {
+    publishing.publications {
+        create("release", MavenPublication::class.java) {
+            from(components.getByName("release"))
+        }
+    }
+}