update to kotlin 1.3.70

icerockdev · Mar 23, 2020 · c0f9252 · c0f9252
1 parent 85ebd07
commit c0f9252
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![moko-template](https://user-images.githubusercontent.com/5010169/66987007-1bbe9880-f0ea-11e9-8c3c-46b25926794b.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) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.61-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) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.70-orange)
 
 # Mobile Kotlin multiplatform project template with MOKO widgets
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,11 +15,9 @@ allprojects {
         maven { url = uri("https://dl.bintray.com/aakira/maven") }
         maven { url = uri("http://dl.bintray.com/lukaville/maven") }
     }
-
-    // workaround for https://youtrack.jetbrains.com/issue/KT-27170
-    configurations.create("compileClasspath")
 }
 
 tasks.register("clean", Delete::class).configure {
+    group = "build"
     delete(rootProject.buildDir)
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -14,9 +14,9 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.5.2")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
-    implementation("com.android.tools.build:gradle:3.5.3")
+    implementation("dev.icerock:mobile-multiplatform:0.6.1")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70")
+    implementation("com.android.tools.build:gradle:3.6.1")
 }
 
 kotlinDslPluginOptions {

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -9,12 +9,12 @@ object Versions {
         const val minSdk = 16
     }
 
-    const val kotlin = "1.3.61"
+    const val kotlin = "1.3.70"
 
-    private const val mokoResources = "0.8.0"
-    private const val mokoNetwork = "0.5.0"
-    private const val mokoUnits = "0.2.2"
-    private const val mokoWidgets = "0.1.0-dev-12"
+    private const val mokoResources = "0.9.0"
+    private const val mokoNetwork = "0.6.0"
+    private const val mokoUnits = "0.3.1"
+    private const val mokoWidgets = "0.1.0-dev-18"
 
     object Plugins {
         const val kotlin = Versions.kotlin
@@ -39,25 +39,25 @@ object Versions {
         object MultiPlatform {
             const val kotlinStdLib = Versions.kotlin
 
-            const val coroutines = "1.3.3"
-            const val serialization = "0.14.0"
-            const val ktorClient = "1.2.6"
+            const val coroutines = "1.3.5"
+            const val serialization = "0.20.0"
+            const val ktorClient = "1.3.2"
             const val ktorClientLogging = ktorClient
 
-            const val mokoParcelize = "0.2.0"
-            const val mokoTime = "0.2.0"
-            const val mokoGraphics = "0.2.0"
-            const val mokoMvvm = "0.4.0"
+            const val mokoParcelize = "0.3.0"
+            const val mokoTime = "0.3.0"
+            const val mokoGraphics = "0.3.0"
+            const val mokoMvvm = "0.6.0"
             const val mokoResources = Versions.mokoResources
             const val mokoNetwork = Versions.mokoNetwork
-            const val mokoFields = "0.2.0"
-            const val mokoPermissions = "0.4.0"
-            const val mokoMedia = "0.2.0"
+            const val mokoFields = "0.3.0"
+            const val mokoPermissions = "0.5.0"
+            const val mokoMedia = "0.4.0"
             const val mokoUnits = Versions.mokoUnits
             const val mokoWidgets = Versions.mokoWidgets
 
-            const val napier = "1.1.0"
-            const val settings = "0.5"
+            const val napier = "1.2.0"
+            const val settings = "0.5.1"
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios-app/Podfile b/ios-app/Podfile
@@ -1,4 +1,4 @@
-source 'https://github.com/CocoaPods/Specs.git'
+source 'https://cdn.cocoapods.org/'
 
 project 'ios-app',
   'dev-release' => :release, 'prod-release' => :release,

diff --git a/ios-app/Podfile.lock b/ios-app/Podfile.lock
@@ -11,6 +11,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   MultiPlatformLibrary: 176fb8ade516666cd47e93de1b71ba0441a541bb
 
-PODFILE CHECKSUM: 5665a5366101598295b6ca5796612645176ceaad
+PODFILE CHECKSUM: cf316fb3fe1bf629f49a1dd70a7b3791f0d2ea1c
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.0
diff --git a/ios-app/src/AppDelegate.swift b/ios-app/src/AppDelegate.swift
@@ -9,7 +9,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
         let app = App()
         app.initialize()
-        ApplicationHolderKt.application = app
 
         let screen = app.rootScreen.instantiate()
         let rootViewController = screen.viewController

diff --git a/mpp-library/build.gradle.kts b/mpp-library/build.gradle.kts
@@ -39,16 +39,3 @@ dependencies {
 multiplatformResources {
     multiplatformResourcesPackage = "org.example.library"
 }
-
-// temporary fix of release builds
-kotlin {
-    targets
-        .filterIsInstance<org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget>()
-        .forEach {
-            it.compilations.all {
-                kotlinOptions {
-                    freeCompilerArgs += "-Xdisable-phases=Devirtualization,DCEPhase"
-                }
-            }
-        }
-}