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

Jump to bottom

KTOR-5293 Update Versions #3289

Merged
merged 23 commits into from Dec 7, 2022
Merged

KTOR-5293 Update Versions #3289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
eb1c176
Update Gradle to 7.5.1
e5l Dec 7, 2022
4e2161d
Update Kotlin to 1.7.22
e5l Dec 7, 2022
c3a71ac
Update kotlinx.html to 0.8.0
e5l Dec 7, 2022
2202c42
Update kotlinx.serialization to 1.4.1
e5l Dec 7, 2022
d444954
Update Netty to 4.1.85.Final
e5l Dec 7, 2022
6fe9627
Update Jetty to 9.4.49.v20220914
e5l Dec 7, 2022
1c41111
Update Tomcat to 9.0.70
e5l Dec 7, 2022
131eaa6
Update OkHttp to 4.10.0
e5l Dec 7, 2022
9640834
Update Gson to 2.10.0
e5l Dec 7, 2022
5394b7f
Update Jackson to 2.14.1
e5l Dec 7, 2022
aa72de2
Update Logback to 1.3.5
e5l Dec 7, 2022
0f43de3
Update Dropwizard to 4.2.13
e5l Dec 7, 2022
92e5387
Update Micrometer to 1.10.2
e5l Dec 7, 2022
7184ce3
Update Mockk to 1.13.3
e5l Dec 7, 2022
baf9a5f
Update jwt to 3.19.3
e5l Dec 7, 2022
9e4e261
Update jwks-rsa to 0.21.2
e5l Dec 7, 2022
2b29f1b
Update pebble to 3.1.6
e5l Dec 7, 2022
71c8f78
Update webjars-locator to 0.52
e5l Dec 7, 2022
85736c5
Update webjars-jquery to 3.6.1
e5l Dec 7, 2022
7b67205
Update thymeleaf to 3.1.1.RELEASE
e5l Dec 7, 2022
4087133
Update xmlutil to 0.84.3
e5l Dec 7, 2022
7704241
Update yamlkt to 0.12.0
e5l Dec 7, 2022
a193f4c
Update slf4j to 2.0.4
e5l Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
*/

plugins {
`kotlin-dsl`
kotlin("plugin.serialization") version "1.6.21"
id("org.gradle.kotlin.kotlin-dsl") version "3.2.4"
kotlin("plugin.serialization") version "1.7.20"
}

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

dependencies {
implementation(kotlin("gradle-plugin", "1.6.21"))
implementation(kotlin("serialization", "1.6.21"))
implementation(kotlin("gradle-plugin", "1.7.20"))
implementation(kotlin("serialization", "1.7.20"))

val ktlint_version = libs.versions.ktlint.version.get()
implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")
Expand Down
19 changes: 8 additions & 11 deletions buildSrc/src/main/kotlin/test/server/TestServerPlugin.kt
View file
Open in desktop
Expand Up @@ -30,17 +30,14 @@ class TestServerPlugin : Plugin<Project> {
}

override fun apply(target: Project) {
target.testTasks {
it.doFirst {
start()
target.configure(target.tasks, object : Action<Task> {
override fun execute(task: Task) {
task.doFirst(object : Action<Task> {
override fun execute(t: Task) {
start()
}
})
}
}
}
}

fun Project.testTasks(block: (Task) -> Unit) {
configure(tasks) {
if (!name.endsWith("Test")) return@configure
block(this)
})
}
}
47 changes: 24 additions & 23 deletions gradle/libs.versions.toml
View file
Open in desktop
@@ -1,59 +1,60 @@
[versions]
kotlin-version = "1.7.20"
kotlinx-html-version = "0.7.5"
kotlin-version = "1.7.22"
kotlinx-html-version = "0.8.0"
coroutines-version = "1.6.4"
atomicfu-version = "0.17.3"
serialization-version = "1.3.3"
serialization-version = "1.4.1"
validator-version = "0.8.0"
ktlint-version = "3.10.0"

netty-version = "4.1.78.Final"
netty-tcnative-version = "2.0.53.Final"
netty-version = "4.1.85.Final"
netty-tcnative-version = "2.0.54.Final"

jetty-version = "9.4.48.v20220622"
jetty-version = "9.4.49.v20220914"
jetty-alpn-api-version = "1.1.3.v20160715"
jetty-alpn-boot-version = "8.1.13.v20181017"

tomcat-version = "9.0.64"
tomcat-version = "9.0.70"

apache-version = "4.1.5"
apacheds-version = "2.0.0-M24"
okhttp-version = "4.9.3"
okhttp-version = "4.10.0"

json-simple-version = "1.1.1"
gson-version = "2.9.0"
jackson-version = "2.13.3"
gson-version = "2.10"
jackson-version = "2.14.1"

junit-version = "4.13.2"
slf4j-version = "1.7.36"
logback-version = "1.2.11"
slf4j-version = "2.0.4"
logback-version = "1.3.5"

dropwizard-version = "4.2.10"
micrometer-version = "1.7.5"
dropwizard-version = "4.2.13"
micrometer-version = "1.10.2"

jansi-version = "2.4.0"
typesafe-version = "1.4.2"

mockk-version = "1.12.4"
mockk-version = "1.13.3"
mokito-kotlin-version = "1.6.0"

java-jwt-version = "3.19.2"
jwks-rsa-version = "0.17.0"
java-jwt-version = "3.19.3"

jwks-rsa-version = "0.21.2"
mustache-version = "0.9.10"
freemarker-version = "2.3.31"
pebble-version = "3.1.5"
pebble-version = "3.1.6"
velocity-version = "2.3"
velocity-tools-version = "3.1"
webjars-locator-version = "0.48"
webjars-jquery-version = "3.3.1"
thymeleaf-version = "3.0.15.RELEASE"
webjars-locator-version = "0.52"
webjars-jquery-version = "3.6.1"
thymeleaf-version = "3.1.1.RELEASE"
javax-servlet-version = "4.0.1"

node-fetch-version = "2.6.7"
abort-controller-version = "3.0.0"
ws-version = "8.5.0"
xmlutil-version = "0.84.0"
yamlkt-version = "0.11.0"
xmlutil-version = "0.84.3"
yamlkt-version = "0.12.0"

[libraries]
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists