Merge pull request #17 from icerockdev/develop

Release 0.3.1

Author: Dorofeev

README.md

@@ -40,6 +40,8 @@ on the platforms. Converts the exception class to an error object to display. Th
   - 0.2.1
 - kotlin 1.4.0
   - 0.3.0
+- kotlin 1.4.21
+  - 0.3.1
 
 ## Installation
 root build.gradle  
@@ -54,7 +56,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:errors:0.3.0")
+    commonMainApi("dev.icerock.moko:errors:0.3.1")
 }
 ```
 

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version("1.4.0")
+    id("org.jetbrains.kotlin.jvm") version("1.4.21")
 }
 
 repositories {
@@ -17,6 +17,6 @@ repositories {
 
 dependencies {
     implementation("dev.icerock:mobile-multiplatform:0.7.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
     implementation("com.android.tools.build:gradle:4.0.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -3,7 +3,7 @@
  */
 
 object Deps {
-    private const val kotlinVersion = "1.4.0"
+    private const val kotlinVersion = "1.4.21"
 
     private const val androidAppCompatVersion = "1.1.0"
     private const val materialDesignVersion = "1.0.0"
@@ -12,10 +12,10 @@ object Deps {
 
     private const val detektVersion = "1.7.4"
 
-    private const val coroutinesVersion = "1.3.9"
-    private const val mokoMvvmVersion = "0.8.0"
-    private const val mokoResourcesVersion = "0.13.1"
-    const val mokoErrorsVersion = "0.3.0"
+    private const val coroutinesVersion = "1.4.2"
+    private const val mokoMvvmVersion = "0.9.0"
+    private const val mokoResourcesVersion = "0.14.0"
+    const val mokoErrorsVersion = "0.3.1"
 
     object Android {
         const val compileSdk = 28
@@ -55,14 +55,17 @@ object Deps {
             const val lifecycle = "androidx.lifecycle:lifecycle-extensions:$androidLifecycleVersion"
             const val coroutines =
                 "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+            const val mokoMvvmDataBinding = "dev.icerock.moko:mvvm-databinding:$mokoMvvmVersion"
         }
 
         object MultiPlatform {
             const val coroutines =
                 "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
             const val mokoResources =
                 "dev.icerock.moko:resources:$mokoResourcesVersion"
-            const val mokoMvvm = "dev.icerock.moko:mvvm:$mokoMvvmVersion"
+            const val mokoMvvmCore = "dev.icerock.moko:mvvm-core:$mokoMvvmVersion"
+            const val mokoMvvmLiveData = "dev.icerock.moko:mvvm-livedata:$mokoMvvmVersion"
             const val mokoErrors = "dev.icerock.moko:errors:$mokoErrorsVersion"
         }
 

errors/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
     androidMainImplementation(Deps.Libs.Android.appCompat)
     androidMainImplementation(Deps.Libs.Android.material)
 
-    commonMainImplementation(Deps.Libs.MultiPlatform.mokoMvvm)
+    commonMainImplementation(Deps.Libs.MultiPlatform.mokoMvvmCore)
     commonMainApi(Deps.Libs.MultiPlatform.mokoResources)
 
     // temporary fix of https://youtrack.jetbrains.com/issue/KT-41083

sample/android-app/build.gradle.kts

@@ -48,6 +48,7 @@ android {
 
 dependencies {
     implementation(Deps.Libs.Android.appCompat)
+    implementation(Deps.Libs.Android.mokoMvvmDataBinding)
 
     implementation(project(":sample:mpp-library"))
 }

sample/android-app/src/main/java/com/icerockdev/MainActivity.kt

@@ -12,7 +12,6 @@ import com.icerockdev.library.createSimpleViewModel
 import com.icerockdev.library.initExceptionStorage
 import dev.icerock.moko.mvvm.MvvmActivity
 import dev.icerock.moko.mvvm.createViewModelFactory
-import dev.icerock.moko.mvvm.dispatcher.eventsDispatcherOnMain
 
 class MainActivity : MvvmActivity<ActivityMainBinding, SimpleViewModel>() {
 

sample/ios-app/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - MultiPlatformLibrary (0.1.0)
+  - MultiPlatformLibrary (0.3.1)
 
 DEPENDENCIES:
   - MultiPlatformLibrary (from `../mpp-library`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../mpp-library"
 
 SPEC CHECKSUMS:
-  MultiPlatformLibrary: 176fb8ade516666cd47e93de1b71ba0441a541bb
+  MultiPlatformLibrary: 5f0f4dfd4a95a1b6e698631cc4425e922ab03125
 
 PODFILE CHECKSUM: e8746dc30e9d53a96c59e8f821148cde03ea8c5b
 

sample/mpp-library/MultiPlatformLibrary.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'MultiPlatformLibrary'
-    spec.version                  = '0.1.0'
+    spec.version                  = '0.3.1'
     spec.homepage                 = 'Link to a Kotlin/Native module homepage'
     spec.source                   = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" }
     spec.authors                  = 'IceRock Development'

sample/mpp-library/build.gradle.kts

@@ -15,7 +15,8 @@ dependencies {
 
     commonMainImplementation(Deps.Libs.MultiPlatform.mokoResources)
     commonMainApi(Deps.Libs.MultiPlatform.mokoErrors)
-    commonMainApi(Deps.Libs.MultiPlatform.mokoMvvm)
+    commonMainApi(Deps.Libs.MultiPlatform.mokoMvvmCore)
+    commonMainApi(Deps.Libs.MultiPlatform.mokoMvvmLiveData)
 
     androidMainImplementation(Deps.Libs.Android.lifecycle)
 }