Merge pull request #218 from arkivanov/update-Kotlin-to-1.5.0

Update Kotlin to 1.5.0

Author: arkivanov

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.4.30"
+            private const val version = "1.5.0"
 
             object Plugin {
                 object Gradle : Dependency(group = Kotlin, name = "kotlin-gradle-plugin", version = version)
@@ -14,9 +14,7 @@ object Deps {
                 object Js : Dependency(group = Kotlin, name = "kotlin-stdlib-js", 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)
+            object Test : Dependency(group = Kotlin, name = "kotlin-test", version = version) {
                 object Junit : Dependency(group = Kotlin, name = "kotlin-test-junit", version = version)
             }
 
@@ -38,7 +36,7 @@ object Deps {
     object Android {
         object Tools {
             object Build : Group(name = "com.android.tools.build") {
-                object Gradle : Dependency(group = Build, name = "gradle", version = "4.1.0")
+                object Gradle : Dependency(group = Build, name = "gradle", version = "4.2.0")
             }
         }
     }

buildSrc/src/main/kotlin/Config.kt

@@ -162,8 +162,7 @@ fun Project.setupMultiplatform() {
 
             commonTest {
                 dependencies {
-                    implementation(Deps.Jetbrains.Kotlin.Test.Common)
-                    implementation(Deps.Jetbrains.Kotlin.TestAnnotations.Common)
+                    implementation(Deps.Jetbrains.Kotlin.Test)
                 }
             }
 
@@ -188,10 +187,6 @@ fun Project.setupMultiplatform() {
             jvmCommonTest {
                 dependsOn(jvmNativeCommonTest)
                 dependsOn(jvmJsCommonTest)
-
-                dependencies {
-                    implementation(Deps.Jetbrains.Kotlin.Test.Junit)
-                }
             }
 
             jvmMain.dependsOn(jvmCommonMain)
@@ -212,10 +207,6 @@ fun Project.setupMultiplatform() {
             jsTest {
                 dependsOn(jsNativeCommonTest)
                 dependsOn(jvmJsCommonTest)
-
-                dependencies {
-                    implementation(Deps.Jetbrains.Kotlin.Test.Js)
-                }
             }
 
             nativeCommonMain {

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip

mvikotlin-test-internal/build.gradle.kts

@@ -7,17 +7,11 @@ kotlinCompat {
                 implementation(project(":mvikotlin"))
                 implementation(project(":rx"))
                 implementation(project(":utils-internal"))
-                implementation(Deps.Jetbrains.Kotlin.Test.Common)
+                implementation(Deps.Jetbrains.Kotlin.Test)
                 implementation(Deps.Jetbrains.Kotlin.TestAnnotations.Common)
             }
         }
 
-        jsMain {
-            dependencies {
-                implementation(Deps.Jetbrains.Kotlin.Test.Js)
-            }
-        }
-
         jvmCommonMain {
             dependencies {
                 implementation(Deps.Jetbrains.Kotlin.Test.Junit)

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

@@ -2,9 +2,15 @@ plugins {
     kotlin("js")
 }
 
+kotlin {
+    js {
+        useCommonJs()
+        browser()
+    }
+}
+
 repositories {
     maven("https://dl.bintray.com/kotlin/kotlin-js-wrappers")
-
 }
 
 val kotlin_version = "pre.94-kotlin-1.3.70" // for kotlin-wrappers
@@ -35,7 +41,6 @@ dependencies {
 
     implementation(npm("core-js", "2.6.5"))
     implementation(npm("svg-inline-loader", "0.8.0"))
-    implementation(npm("abort-controller"))
     implementation(npm("react", "16.13.0"))
     implementation(npm("react-dom", "16.13.0"))
     implementation(npm("react-is", "16.13.0"))
@@ -44,13 +49,3 @@ dependencies {
     implementation(npm("@material-ui/core", "4.9.14"))
     implementation(npm("@material-ui/icons", "4.9.1"))
 }
-
-kotlin.withGroovyBuilder {
-    "js" {
-        "useCommonJs"()
-        "browser"()
-        "binaries" {
-            "executable"()
-        }
-    }
-}

sample/todo-app-js/src/main/kotlin/root/Main.kt

@@ -31,5 +31,5 @@ fun main() {
 }
 
 fun Any.debugLog(text: String?) {
-    if (text.isNullOrEmpty().not()) console.log("${this::class.simpleName?.toUpperCase()}: $text")
+    if (text.isNullOrEmpty().not()) console.log("${this::class.simpleName?.uppercase()}: $text")
 }