Merge pull request #138 from arkivanov/update-kotlin-to-1.4.0

Update Kotlin to 1.4.0

Author: arkivanov

buildSrc/buildSrc/src/main/kotlin/Deps.kt …Src/src/main/kotlin/dependencies/Deps.ktbuildSrc/buildSrc/src/main/kotlin/Deps.kt renamed to buildSrc/buildSrc/src/main/kotlin/dependencies/Deps.kt buildSrc/buildSrc/src/main/kotlin/Deps.kt renamed to buildSrc/buildSrc/src/main/kotlin/dependencies/Deps.kt

@@ -2,7 +2,7 @@ object Deps {
 
     object Jetbrains {
         object Kotlin : Group(name = "org.jetbrains.kotlin") {
-            private const val version = "1.3.72"
+            private const val version = "1.4.0"
 
             object Plugin {
                 object Gradle : Dependency(group = Kotlin, name = "kotlin-gradle-plugin", version = version)
@@ -14,8 +14,6 @@ object Deps {
                 object Js : Dependency(group = Kotlin, name = "kotlin-stdlib-js", version = version)
             }
 
-            object Reflect : Dependency(group = Kotlin, name = "kotlin-reflect", version = version)
-
             object Test {
                 object Common : Dependency(group = Kotlin, name = "kotlin-test-common", version = version)
                 object Js : Dependency(group = Kotlin, name = "kotlin-test-js", version = version)
@@ -29,14 +27,9 @@ object Deps {
 
         object Kotlinx : Group(name = "org.jetbrains.kotlinx") {
             object Coroutines {
-                private const val version = "1.3.5"
-
-                object Core : Dependency(group = Kotlinx, name = "kotlinx-coroutines-core", version = version) {
-                    object Common : Dependency(group = Kotlinx, name = "kotlinx-coroutines-core-common", version = version)
-                    object Native : Dependency(group = Kotlinx, name = "kotlinx-coroutines-core-native", version = version)
-                    object Js : Dependency(group = Kotlinx, name = "kotlinx-coroutines-core-js", version = version)
-                }
+                private const val version = "1.3.9"
 
+                object Core : Dependency(group = Kotlinx, name = "kotlinx-coroutines-core", version = version)
                 object Android : Dependency(group = Kotlinx, name = "kotlinx-coroutines-android", version = version)
             }
         }
@@ -81,7 +74,7 @@ object Deps {
 
     object Badoo {
         object Reaktive : Group(name = "com.badoo.reaktive") {
-            private const val version = "1.1.16"
+            private const val version = "1.1.17"
 
             object Reaktive : Dependency(group = Badoo.Reaktive, name = "reaktive", version = version)
             object ReaktiveAnnotations : Dependency(group = Badoo.Reaktive, name = "reaktive-annotations", version = version)

buildSrc/src/main/kotlin/Config.kt

@@ -95,15 +95,22 @@ inline fun <reified T : BuildTarget> ExtensionAware.doIfBuildTargetAvailable(blo
     }
 }
 
+val Project.isAnyTargetAvailable: Boolean
+    get() = buildType.buildTargets.any { it in buildTargets }
+
 fun Project.setupMultiplatform() {
-    plugins.apply("kotlin-multiplatform")
+    if (!isAnyTargetAvailable) {
+        return
+    }
 
     doIfBuildTargetAvailable<BuildTarget.Android> {
         plugins.apply("com.android.library")
 
         setupAndroidSdkVersions()
     }
 
+    plugins.apply("kotlin-multiplatform")
+
     kotlin {
         doIfBuildTargetAvailable<BuildTarget.Js> {
             js {
@@ -367,7 +374,9 @@ fun Project.android(block: BaseExtension.() -> Unit) {
 }
 
 fun Project.kotlin(block: KotlinMultiplatformExtension.() -> Unit) {
-    extensions.getByType<KotlinMultiplatformExtension>().block()
+    if (isAnyTargetAvailable) {
+        extensions.getByType<KotlinMultiplatformExtension>().block()
+    }
 }
 
 fun Project.setupXcodeSync() {

mvikotlin-extensions-coroutines/build.gradle.kts

@@ -9,26 +9,8 @@ kotlin {
                 implementation(project(":rx"))
                 implementation(project(":utils-internal"))
                 implementation(Deps.Badoo.Reaktive.Utils)
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Common)
-            }
-        }
-
-        jvmCommonMain {
-            dependencies {
                 implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core)
             }
         }
-
-        nativeCommonMain {
-            dependencies {
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Native)
-            }
-        }
-
-        jsMain {
-            dependencies {
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Js)
-            }
-        }
     }
 }

mvikotlin-timetravel-proto-internal/build.gradle.kts

@@ -9,4 +9,4 @@ kotlin {
             }
         }
     }
-}
+}

sample/todo-app-js/build.gradle.kts

@@ -14,7 +14,7 @@ val muirwik_version = "0.4.1"
 
 dependencies {
     implementation(Deps.Jetbrains.Kotlin.StdLib.Js)
-    implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Js)
+    implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core)
 
     implementation("org.jetbrains:kotlin-react:$kotlin_react_version")
     implementation("org.jetbrains:kotlin-react-dom:$kotlin_react_version")
@@ -44,5 +44,12 @@ dependencies {
     implementation(npm("@material-ui/icons", "4.9.1"))
 }
 
-kotlin.target.useCommonJs()
-kotlin.target.browser {}
+kotlin.withGroovyBuilder {
+    "js" {
+        "useCommonJs"()
+        "browser"()
+        "binaries" {
+            "executable"()
+        }
+    }
+}

sample/todo-coroutines/build.gradle.kts

@@ -10,26 +10,8 @@ kotlin {
                 implementation(project(":mvikotlin-extensions-coroutines"))
                 api(project(":sample:todo-common"))
                 implementation(project(":sample:todo-common-internal"))
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Common)
-            }
-        }
-
-        jvmCommonMain {
-            dependencies {
                 implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core)
             }
         }
-
-        nativeCommonMain {
-            dependencies {
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Native)
-            }
-        }
-
-        jsMain {
-            dependencies {
-                implementation(Deps.Jetbrains.Kotlinx.Coroutines.Core.Js)
-            }
-        }
     }
 }