Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kotlin 1.5.21 #71

Merged
merged 2 commits into from
Aug 11, 2021
Merged

Update kotlin 1.5.21 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfa73e
Update kotlin 1.5.21 and coroutines 1.5.1-native-mt.
AAkira Aug 11, 2021
023b974
Fix test.
AAkira Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/dependencies/Dep.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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"
}
Expand Down
10 changes: 5 additions & 5 deletions js/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
9 changes: 7 additions & 2 deletions napier/src/commonTest/kotlin/io/github/aakira/napier/NapierTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -25,7 +25,12 @@ class NapierTest {
fun `Check output log`() {
val output = AtomicMutableList<Expected>()
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))
}
})
Expand Down
1 change: 0 additions & 1 deletion napier/src/iosTest/kotlin/io/github/aakira/napier/NapierIosTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.github.aakira.napier

import io.github.aakira.napier.DebugAntilog
import kotlin.test.Test
import kotlin.test.assertEquals

Expand Down
12 changes: 8 additions & 4 deletions napier/src/jvmTest/kotlin/io/github/aakira/napier/NapierJvmTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down