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-6351 Bump Ktor to 2.3.5 and Kotlin to 1.9.10 #180

Merged
merged 1 commit into from
Oct 5, 2023
Merged

KTOR-6351 Bump Ktor to 2.3.5 and Kotlin to 1.9.10 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions chat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
}
}

Expand Down Expand Up @@ -33,14 +33,14 @@ kotlin {

sourceSets.each {
it.dependencies {
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
}
}

sourceSets {
backendMain {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"
implementation "io.ktor:ktor-server-netty"
implementation "io.ktor:ktor-server-websockets"
implementation "io.ktor:ktor-server-call-logging"
Expand Down
2 changes: 1 addition & 1 deletion client-mpp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
Expand Down
2 changes: 1 addition & 1 deletion client-mpp/shared/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kotlin {

sourceSets.each {
it.dependencies {
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
}
}

Expand Down
6 changes: 3 additions & 3 deletions client-multipart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
classpath "io.ktor.plugin:plugin:2.3.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "io.ktor.plugin:plugin:2.3.5"
}
}

Expand All @@ -27,7 +27,7 @@ repositories {
}

dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
implementation "io.ktor:ktor-server-html-builder"
implementation 'ch.qos.logback:logback-classic:1.4.6'
implementation 'io.ktor:ktor-server-netty-jvm'
Expand Down
6 changes: 3 additions & 3 deletions client-tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
classpath "io.ktor.plugin:plugin:2.3.4"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
classpath "io.ktor.plugin:plugin:2.3.5"
}
}

Expand All @@ -27,7 +27,7 @@ repositories {
}

dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
implementation "io.ktor:ktor-server-html-builder"
implementation 'ch.qos.logback:logback-classic:1.4.6'
implementation 'io.ktor:ktor-server-netty-jvm'
Expand Down
6 changes: 3 additions & 3 deletions di-kodein/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("plugin.serialization") version "1.8.22"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
kotlin("plugin.serialization") version "1.9.10"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion di-kodein/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions filelisting/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion filelisting/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions fullstack-mpp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
}
}

Expand All @@ -29,7 +29,7 @@ kotlin {

sourceSets.each {
it.dependencies {
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.4"))
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.5"))
}
}

Expand Down
4 changes: 2 additions & 2 deletions graalvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
application
kotlin("jvm") version "1.7.20"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
id("org.graalvm.buildtools.native") version "0.9.19"
}

Expand Down
4 changes: 2 additions & 2 deletions h2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ val logback_version: String by project

plugins {
application
kotlin("jvm") version "1.7.20"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

group = "io.ktor.samples"
Expand Down
2 changes: 1 addition & 1 deletion h2/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.7.20
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions httpbin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion httpbin/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official

Expand Down
6 changes: 3 additions & 3 deletions jwt-auth-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm") version "1.8.22"
kotlin("plugin.serialization") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
kotlin("plugin.serialization") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
6 changes: 3 additions & 3 deletions kweet/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ val logback_version: String by project
val exposed_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("plugin.serialization") version "1.8.22"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
kotlin("plugin.serialization") version "1.9.10"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion kweet/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
exposed_version=0.40.1
kotlin.code.style=official
4 changes: 2 additions & 2 deletions location-header/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion location-header/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions maven-google-appengine-standard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>maven-google-appengine-standard</artifactId>

<properties>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
<slf4j.version>1.7.36</slf4j.version>
<appengine.version>2.0.12</appengine.version>
<servlet.version>4.0.1</servlet.version>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>io.ktor</groupId>
<artifactId>ktor-bom</artifactId>
<version>2.3.4</version>
<version>2.3.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions mongodb/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ val logback_version: String by project
val mongodb_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
}

group = "com.example"
Expand All @@ -32,7 +32,7 @@ dependencies {
implementation("org.litote.kmongo:kmongo:$mongodb_version")
testImplementation("io.ktor:ktor-server-tests-jvm")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.4")
testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.5")
}

tasks.register("databaseInstance") {
Expand Down
2 changes: 1 addition & 1 deletion mongodb/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
mongodb_version=4.8.0
kotlin.code.style=official
4 changes: 2 additions & 2 deletions postgres/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.2.3"
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
}

group = "com.example"
Expand Down
2 changes: 1 addition & 1 deletion postgres/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions redirect-with-exception/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion redirect-with-exception/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions reverse-proxy-ws/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion reverse-proxy-ws/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions reverse-proxy/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion reverse-proxy/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions rx/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion rx/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions sse/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion sse/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
4 changes: 2 additions & 2 deletions structured-logging/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion structured-logging/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin_version=1.8.22
kotlin_version=1.9.10
logback_version=1.2.11
kotlin.code.style=official
6 changes: 3 additions & 3 deletions version-diff/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ val kotlin_version: String by project
val logback_version: String by project

plugins {
kotlin("jvm") version "1.8.22"
id("io.ktor.plugin") version "2.3.4"
kotlin("plugin.serialization") version "1.8.22"
kotlin("jvm") version "1.9.10"
id("io.ktor.plugin") version "2.3.5"
kotlin("plugin.serialization") version "1.9.10"
}

group = "org.example"
Expand Down
Loading
Loading