Skip to content

Commit 6020a5a

Browse files
committed
chore: gradle 9.0.0-RC1 support
1 parent ec33489 commit 6020a5a

File tree

5 files changed

+65
-33
lines changed

5 files changed

+65
-33
lines changed

backend/jvm/src/test/kotlin/dev/suresh/AppTests.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import io.ktor.server.request.*
1818
import io.ktor.server.response.*
1919
import io.ktor.server.routing.*
2020
import io.ktor.server.testing.*
21+
import kotlin.test.*
2122
import kotlinx.coroutines.slf4j.MDCContext
2223
import kotlinx.coroutines.test.runTest
2324
import kotlinx.coroutines.withContext
@@ -31,7 +32,6 @@ import org.testcontainers.images.builder.Transferable
3132
import org.testcontainers.junit.jupiter.Container
3233
import org.testcontainers.junit.jupiter.Testcontainers
3334
import org.testcontainers.utility.DockerImageName
34-
import kotlin.test.*
3535

3636
@Testcontainers
3737
@EnabledIfSystemProperty(named = "ktorTest", matches = "true")
@@ -66,14 +66,16 @@ class AppTests {
6666
val errorLogs = mutableListOf<String>()
6767

6868
environment {
69-
log = object : Logger by logger{
70-
override fun info(msg: String) {
69+
log =
70+
object : Logger by logger {
71+
override fun info(msg: String) {
7172
infoLogs += msg
72-
}
73-
override fun error(msg: String) {
73+
}
74+
75+
override fun error(msg: String) {
7476
errorLogs += msg
77+
}
7578
}
76-
}
7779
config = MapApplicationConfig("ktor.environment" to "test")
7880
}
7981

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ org.gradle.parallel=true
44
org.gradle.caching=true
55
org.gradle.configureondemand=true
66
org.gradle.configuration-cache=true
7-
org.gradle.configuration-cache.parallel=true
87
org.gradle.configuration-cache.problems=warn
98
org.gradle.kotlin.dsl.allWarningsAsErrors=true
109
org.gradle.daemon=true
10+
# org.gradle.configuration-cache.parallel=true
1111
# org.gradle.unsafe.isolated-projects=false
1212
# org.gradle.daemon.idletimeout=300000
1313
# org.gradle.logging.stacktrace=all

gradle/kotlin-js-store/package-lock.json

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/kotlin-js-store/wasm/package-lock.json

Lines changed: 40 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)