Skip to content

Commit 0c979af

Browse files
authored
KTOR-5293 Update Versions (#3289)
* Update Gradle to 7.5.1 * Update Kotlin to 1.7.22 * Update kotlinx.html to 0.8.0 * Update kotlinx.serialization to 1.4.1 * Update Netty to 4.1.85.Final * Update Jetty to 9.4.49.v20220914 * Update Tomcat to 9.0.70 * Update OkHttp to 4.10.0 * Update Gson to 2.10.0 * Update Jackson to 2.14.1 * Update Logback to 1.3.5 * Update Dropwizard to 4.2.13 * Update Micrometer to 1.10.2 * Update Mockk to 1.13.3 * Update jwt to 3.19.3 * Update jwks-rsa to 0.21.2 * Update pebble to 3.1.6 * Update webjars-locator to 0.52 * Update webjars-jquery to 3.6.1 * Update thymeleaf to 3.1.1.RELEASE * Update xmlutil to 0.84.3 * Update yamlkt to 0.12.0 * Update slf4j to 2.0.4
1 parent 0e60c96 commit 0c979af

13 files changed

Lines changed: 281 additions & 386 deletions

File tree

buildSrc/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
*/
44

55
plugins {
6-
`kotlin-dsl`
7-
kotlin("plugin.serialization") version "1.6.21"
6+
id("org.gradle.kotlin.kotlin-dsl") version "3.2.4"
7+
kotlin("plugin.serialization") version "1.7.20"
88
}
99

1010
val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoolean() == true
@@ -22,8 +22,8 @@ sourceSets.main {
2222
}
2323

2424
dependencies {
25-
implementation(kotlin("gradle-plugin", "1.6.21"))
26-
implementation(kotlin("serialization", "1.6.21"))
25+
implementation(kotlin("gradle-plugin", "1.7.20"))
26+
implementation(kotlin("serialization", "1.7.20"))
2727

2828
val ktlint_version = libs.versions.ktlint.version.get()
2929
implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")

buildSrc/src/main/kotlin/test/server/TestServerPlugin.kt

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,14 @@ class TestServerPlugin : Plugin<Project> {
3030
}
3131

3232
override fun apply(target: Project) {
33-
target.testTasks {
34-
it.doFirst {
35-
start()
33+
target.configure(target.tasks, object : Action<Task> {
34+
override fun execute(task: Task) {
35+
task.doFirst(object : Action<Task> {
36+
override fun execute(t: Task) {
37+
start()
38+
}
39+
})
3640
}
37-
}
38-
}
39-
}
40-
41-
fun Project.testTasks(block: (Task) -> Unit) {
42-
configure(tasks) {
43-
if (!name.endsWith("Test")) return@configure
44-
block(this)
41+
})
4542
}
4643
}

gradle/libs.versions.toml

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
[versions]
2-
kotlin-version = "1.7.20"
3-
kotlinx-html-version = "0.7.5"
2+
kotlin-version = "1.7.22"
3+
kotlinx-html-version = "0.8.0"
44
coroutines-version = "1.6.4"
55
atomicfu-version = "0.17.3"
6-
serialization-version = "1.3.3"
6+
serialization-version = "1.4.1"
77
validator-version = "0.8.0"
88
ktlint-version = "3.10.0"
99

10-
netty-version = "4.1.78.Final"
11-
netty-tcnative-version = "2.0.53.Final"
10+
netty-version = "4.1.85.Final"
11+
netty-tcnative-version = "2.0.54.Final"
1212

13-
jetty-version = "9.4.48.v20220622"
13+
jetty-version = "9.4.49.v20220914"
1414
jetty-alpn-api-version = "1.1.3.v20160715"
1515
jetty-alpn-boot-version = "8.1.13.v20181017"
1616

17-
tomcat-version = "9.0.64"
17+
tomcat-version = "9.0.70"
1818

1919
apache-version = "4.1.5"
2020
apacheds-version = "2.0.0-M24"
21-
okhttp-version = "4.9.3"
21+
okhttp-version = "4.10.0"
2222

2323
json-simple-version = "1.1.1"
24-
gson-version = "2.9.0"
25-
jackson-version = "2.13.3"
24+
gson-version = "2.10"
25+
jackson-version = "2.14.1"
2626

2727
junit-version = "4.13.2"
28-
slf4j-version = "1.7.36"
29-
logback-version = "1.2.11"
28+
slf4j-version = "2.0.4"
29+
logback-version = "1.3.5"
3030

31-
dropwizard-version = "4.2.10"
32-
micrometer-version = "1.7.5"
31+
dropwizard-version = "4.2.13"
32+
micrometer-version = "1.10.2"
3333

3434
jansi-version = "2.4.0"
3535
typesafe-version = "1.4.2"
3636

37-
mockk-version = "1.12.4"
37+
mockk-version = "1.13.3"
3838
mokito-kotlin-version = "1.6.0"
3939

40-
java-jwt-version = "3.19.2"
41-
jwks-rsa-version = "0.17.0"
40+
java-jwt-version = "3.19.3"
41+
42+
jwks-rsa-version = "0.21.2"
4243
mustache-version = "0.9.10"
4344
freemarker-version = "2.3.31"
44-
pebble-version = "3.1.5"
45+
pebble-version = "3.1.6"
4546
velocity-version = "2.3"
4647
velocity-tools-version = "3.1"
47-
webjars-locator-version = "0.48"
48-
webjars-jquery-version = "3.3.1"
49-
thymeleaf-version = "3.0.15.RELEASE"
48+
webjars-locator-version = "0.52"
49+
webjars-jquery-version = "3.6.1"
50+
thymeleaf-version = "3.1.1.RELEASE"
5051
javax-servlet-version = "4.0.1"
5152

5253
node-fetch-version = "2.6.7"
5354
abort-controller-version = "3.0.0"
5455
ws-version = "8.5.0"
55-
xmlutil-version = "0.84.0"
56-
yamlkt-version = "0.11.0"
56+
xmlutil-version = "0.84.3"
57+
yamlkt-version = "0.12.0"
5758

5859
[libraries]
5960
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)