diff --git a/buildSrc/src/main/kotlin/dependencies/Dep.kt b/buildSrc/src/main/kotlin/dependencies/Dep.kt index ea00e19..413c6b7 100644 --- a/buildSrc/src/main/kotlin/dependencies/Dep.kt +++ b/buildSrc/src/main/kotlin/dependencies/Dep.kt @@ -2,7 +2,7 @@ package dependencies object Dep { - private const val kotlin = "1.5.0" + private const val kotlin = "1.5.21" object GradlePlugin { const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dep.kotlin}" @@ -20,7 +20,7 @@ object Dep { } object Coroutines { - private const val version = "1.5.0-RC" + private const val version = "1.5.1-native-mt" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" } diff --git a/js/build.gradle.kts b/js/build.gradle.kts index 321b471..84559b4 100644 --- a/js/build.gradle.kts +++ b/js/build.gradle.kts @@ -14,15 +14,15 @@ dependencies { } kotlin { - target { + js { browser { // execute :js:browserRun to launch dev server runTask { devServer = KotlinWebpackConfig.DevServer( - true, false, true, true, false, - 8080, - null, - listOf("${projectDir}/src/main/resources".toString()) + open = true, + port = 8080, + proxy = null, + contentBase = mutableListOf("${projectDir}/src/main/resources") ) outputFileName = "main.js" } diff --git a/napier/src/commonTest/kotlin/io/github/aakira/napier/NapierTest.kt b/napier/src/commonTest/kotlin/io/github/aakira/napier/NapierTest.kt index 33f8b80..118a7e3 100644 --- a/napier/src/commonTest/kotlin/io/github/aakira/napier/NapierTest.kt +++ b/napier/src/commonTest/kotlin/io/github/aakira/napier/NapierTest.kt @@ -1,6 +1,6 @@ package io.github.aakira.napier -import com.github.aakira.napier.atomic.AtomicMutableList +import io.github.aakira.napier.atomic.AtomicMutableList import kotlin.test.Test import kotlin.test.assertEquals @@ -25,7 +25,12 @@ class NapierTest { fun `Check output log`() { val output = AtomicMutableList() Napier.base(object : Antilog() { - override fun performLog(priority: Napier.Level, tag: String?, throwable: Throwable?, message: String?) { + override fun performLog( + priority: Napier.Level, + tag: String?, + throwable: Throwable?, + message: String? + ) { output.add(Expected(priority, tag, throwable, message)) } }) diff --git a/napier/src/iosTest/kotlin/io/github/aakira/napier/NapierIosTest.kt b/napier/src/iosTest/kotlin/io/github/aakira/napier/NapierIosTest.kt index c96f53a..7550c8f 100644 --- a/napier/src/iosTest/kotlin/io/github/aakira/napier/NapierIosTest.kt +++ b/napier/src/iosTest/kotlin/io/github/aakira/napier/NapierIosTest.kt @@ -1,6 +1,5 @@ package io.github.aakira.napier -import io.github.aakira.napier.DebugAntilog import kotlin.test.Test import kotlin.test.assertEquals diff --git a/napier/src/jvmTest/kotlin/io/github/aakira/napier/NapierJvmTest.kt b/napier/src/jvmTest/kotlin/io/github/aakira/napier/NapierJvmTest.kt index ef96cbc..729bda8 100644 --- a/napier/src/jvmTest/kotlin/io/github/aakira/napier/NapierJvmTest.kt +++ b/napier/src/jvmTest/kotlin/io/github/aakira/napier/NapierJvmTest.kt @@ -1,7 +1,5 @@ package io.github.aakira.napier -import io.github.aakira.napier.DebugAntilog -import io.github.aakira.napier.Napier import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals @@ -13,8 +11,14 @@ class NapierJvmTest { @Test fun `Check createStackElementTag`() { assertEquals("Hoge", debugAntilog.createStackElementTag("io.github.aakira.napier.Hoge")) - assertEquals("Hoge2", debugAntilog.createStackElementTag("AA\$io.github.aakira.napier.Hoge2")) - assertNotEquals("default", debugAntilog.createStackElementTag("io.github.aakira.napier.Hoge3\$default")) + assertEquals( + "Hoge2", + debugAntilog.createStackElementTag("AA\$io.github.aakira.napier.Hoge2") + ) + assertNotEquals( + "default", + debugAntilog.createStackElementTag("io.github.aakira.napier.Hoge3\$default") + ) } @Test