Skip to content

Commit

Permalink
Merge pull request #1 from icerockdev/develop
Browse files Browse the repository at this point in the history
update to kotlin 1.3.60
  • Loading branch information
Alex009 authored Nov 19, 2019
2 parents 47f8565 + d9eac4f commit a8bfdf0
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
![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://api.bintray.com/packages/icerockdev/moko/moko-core/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-core/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.50-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://api.bintray.com/packages/icerockdev/moko/moko-parcelize/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-parcelize/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.60-orange)

# Mobile Kotlin parcelize
This is a Kotlin Multiplatform library that supports Parcelize in common code.
Expand All @@ -26,6 +26,8 @@ This is a Kotlin Multiplatform library that supports Parcelize in common code.
## Versions
- kotlin 1.3.50
- 0.1.0
- kotlin 1.3.60
- 0.2.0

## Installation
root build.gradle
Expand All @@ -40,7 +42,7 @@ allprojects {
project build.gradle
```groovy
dependencies {
commonMainApi("dev.icerock.moko:parcelize:0.1.0")
commonMainApi("dev.icerock.moko:parcelize:0.2.0")
}
```

Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ repositories {
}

dependencies {
implementation("dev.icerock:mobile-multiplatform:0.3.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
implementation("com.android.tools.build:gradle:3.5.0")
implementation("dev.icerock:mobile-multiplatform:0.4.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.60")
implementation("com.android.tools.build:gradle:3.5.2")
}

kotlinDslPluginOptions {
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object Versions {
const val minSdk = 16
}

const val kotlin = "1.3.50"
const val kotlin = "1.3.60"

object Plugins {
const val kotlin = Versions.kotlin
Expand All @@ -18,11 +18,11 @@ object Versions {

object Libs {
object Android {
const val appCompat = "1.0.2"
const val appCompat = "1.1.0"
}

object MultiPlatform {
const val mokoParcelize: String = "0.1.0"
const val mokoParcelize: String = "0.2.0"
}
}
}
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ org.gradle.parallel=true
kotlin.code.style=official

android.useAndroidX=true
android.enableJetifier=true
android.databinding.enableV2=true
android.enableJetifier=true
4 changes: 0 additions & 4 deletions parcelize/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ android {
}
}

androidExtensions {
isExperimental = true
}

dependencies {
mppLibrary(Deps.Libs.MultiPlatform.kotlinStdLib)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)
}

override fun onSaveInstanceState(outState: Bundle?) {
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)

outState?.putParcelable(userInstanceKey, user)
outState.putParcelable(userInstanceKey, user)
}

override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
Expand Down
11 changes: 9 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ pluginManagement {

enableFeaturePreview("GRADLE_METADATA")

val properties = startParameter.projectProperties

// ./gradlew -PlibraryPublish publishToMavenLocal
val libraryPublish: Boolean = properties.containsKey("libraryPublish")

include(":parcelize")
include(":sample:android-app")
include(":sample:mpp-library")
if(!libraryPublish) {
include(":sample:android-app")
include(":sample:mpp-library")
}

0 comments on commit a8bfdf0

Please sign in to comment.