Revert "Upgrade to Kotlin 1.4.0 (#127)" (#133)

* Revert "Upgrade to Kotlin 1.4.0 (#127)" This reverts commit e0fff5b until #130 is resolved * fix slf4j property
oshai · Sep 10, 2020 · f677777 · f677777
1 parent d51e868
commit f677777
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import java.util.*
 
 plugins {
-    kotlin("multiplatform") version "1.4.0"
+    kotlin("multiplatform") version "1.3.72"
     id("com.jfrog.bintray") version "1.8.4"
     id("org.jetbrains.dokka") version "0.10.0"
     `maven-publish`
@@ -46,34 +46,45 @@ kotlin {
         compilations.named("main") {
             // kotlin compiler compatibility options
             kotlinOptions {
-                apiVersion = "1.2"
-                languageVersion = "1.2"
+                apiVersion = "1.1"
+                languageVersion = "1.1"
             }
         }
         mavenPublication {
             // make a name of jvm artifact backward-compatible, default "-jvm"
             artifactId = rootProject.name
         }
     }
-    js(BOTH) {
-        browser()
-        //nodejs()
+    js {
+        compilations.named("main") {
+            kotlinOptions {
+                metaInfo = true
+                sourceMap = true
+                verbose = true
+                moduleKind = "umd"
+            }
+        }
     }
     linuxX64("linuxX64")
     sourceSets {
-        val commonMain by getting {}
-        val commonTest by getting  {
+        commonMain {
+            dependencies {
+                implementation(kotlin("stdlib-common"))
+            }
+        }
+        commonTest {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
             }
         }
-        val jvmMain by getting {
+        named("jvmMain") {
             dependencies {
+                implementation(kotlin("stdlib"))
                 api("org.slf4j:slf4j-api:${extra["slf4j_version"]}")
             }
         }
-        val jvmTest by getting {
+        named("jvmTest") {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
@@ -84,8 +95,12 @@ kotlin {
                 implementation("org.apache.logging.log4j:log4j-slf4j-impl:${extra["log4j_version"]}")
             }
         }
-        val jsMain by getting {}
-        val jsTest by getting {
+        named("jsMain") {
+            dependencies {
+                implementation(kotlin("stdlib-js"))
+            }
+        }
+        named("jsTest") {
             dependencies {
                 implementation(kotlin("test-js"))
             }

diff --git a/src/jvmTest/kotlin/mu/LoggingTest.kt b/src/jvmTest/kotlin/mu/LoggingTest.kt
@@ -209,7 +209,7 @@ class LoggingTest {
         LambdaRaisesError().test()
         appenderWithWriter.writer.flush()
         Assert.assertEquals(
-            "INFO  mu.LambdaRaisesError  - Log message invocation failed: java.lang.NullPointerException",
+            "INFO  mu.LambdaRaisesError  - Log message invocation failed: kotlin.KotlinNullPointerException",
             appenderWithWriter.writer.toString().trim()
         )
     }