Skip to content

Commit d098d98

Browse files
nomisRevnomisRev
authored
Merge branch 'main' into nomisrev/fix-graalvm
2 parents d20d8c2 + 77f87c9 commit d098d98

File tree

57 files changed

+117
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+117
-115
lines changed

‎chat/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
7-
classpath "org.jetbrains.kotlin:kotlin-serialization:2.1.0"
6+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20"
7+
classpath "org.jetbrains.kotlin:kotlin-serialization:2.1.20"
88
}
99
}
1010

@@ -30,14 +30,14 @@ kotlin {
3030

3131
sourceSets.each {
3232
it.dependencies {
33-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.1"))
33+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.2"))
3434
}
3535
}
3636

3737
sourceSets {
3838
backendMain {
3939
dependencies {
40-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0"
40+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20"
4141
implementation "io.ktor:ktor-server-netty"
4242
implementation "io.ktor:ktor-server-websockets"
4343
implementation "io.ktor:ktor-server-call-logging"

‎client-mpp/androidApp/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@ android {
3131
sourceCompatibility = JavaVersion.VERSION_17
3232
targetCompatibility = JavaVersion.VERSION_17
3333
}
34+
kotlinOptions {
35+
jvmTarget = "17"
36+
}
3437
namespace = "io.ktor.samples.mpp.client"
3538
}

‎client-mpp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
gradlePluginPortal()
66
}
77
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
8+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
99
classpath("com.android.tools.build:gradle:8.6.1")
1010
}
1111
}

‎client-mpp/shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kotlin {
2525

2626
sourceSets.forEach {
2727
it.dependencies {
28-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.1"))
28+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.2"))
2929
}
3030
}
3131

‎client-multipart/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
gradlePluginPortal()
55
}
66
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
8-
classpath "io.ktor.plugin:plugin:3.1.1"
7+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20"
8+
classpath "io.ktor.plugin:plugin:3.1.2"
99
}
1010
}
1111

@@ -27,7 +27,7 @@ repositories {
2727
}
2828

2929
dependencies {
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0'
30+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20'
3131
implementation "io.ktor:ktor-server-html-builder"
3232
implementation 'ch.qos.logback:logback-classic:1.5.12'
3333
implementation 'io.ktor:ktor-server-netty-jvm'

‎client-native-image/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ repositories {
3535
}
3636

3737
dependencies {
38-
implementation("io.ktor:ktor-client-apache:3.1.1")
39-
implementation("io.ktor:ktor-client-cio:3.1.1")
38+
implementation("io.ktor:ktor-client-apache:3.1.2")
39+
implementation("io.ktor:ktor-client-cio:3.1.2")
4040
testImplementation(kotlin("test"))
4141
}
4242

‎client-tools/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
gradlePluginPortal()
55
}
66
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
8-
classpath "io.ktor.plugin:plugin:3.1.1"
7+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20"
8+
classpath "io.ktor.plugin:plugin:3.1.2"
99
}
1010
}
1111

@@ -27,7 +27,7 @@ repositories {
2727
}
2828

2929
dependencies {
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0'
30+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20'
3131
implementation "io.ktor:ktor-server-html-builder"
3232
implementation 'ch.qos.logback:logback-classic:1.5.12'
3333
implementation 'io.ktor:ktor-server-netty-jvm'

‎client-tools/src/ToolsApp.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import io.ktor.client.*
2-
import io.ktor.client.call.body
3-
import io.ktor.client.engine.cio.*
42
import io.ktor.client.request.*
53
import io.ktor.client.statement.*
64
import io.ktor.http.*

‎di-kodein/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "2.1.0"
6-
id("io.ktor.plugin") version "3.1.1"
7-
kotlin("plugin.serialization") version "2.1.0"
5+
kotlin("jvm") version "2.1.20"
6+
id("io.ktor.plugin") version "3.1.2"
7+
kotlin("plugin.serialization") version "2.1.20"
88
}
99

1010
application {

‎di-kodein/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
kotlin.code.style=official

‎filelisting/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "2.1.0"
6-
id("io.ktor.plugin") version "3.1.1"
5+
kotlin("jvm") version "2.1.20"
6+
id("io.ktor.plugin") version "3.1.2"
77
}
88

99
application {

‎filelisting/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
kotlin.code.style=official

‎fullstack-mpp/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.targets.js.webpack.*
22

33
plugins {
4-
id("org.jetbrains.kotlin.multiplatform") version "2.1.0"
4+
id("org.jetbrains.kotlin.multiplatform") version "2.1.20"
55
}
66

77
kotlin {
@@ -24,7 +24,7 @@ kotlin {
2424

2525
sourceSets.forEach {
2626
it.dependencies {
27-
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.1"))
27+
implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.1.2"))
2828
}
2929
}
3030

‎graalvm/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
application
3-
kotlin("jvm") version "2.1.0"
4-
id("io.ktor.plugin") version "3.1.1"
3+
kotlin("jvm") version "2.1.20"
4+
id("io.ktor.plugin") version "3.1.2"
55
id("org.graalvm.buildtools.native") version "0.9.19"
66
}
77

‎h2/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ val logback_version: String by project
33

44
plugins {
55
application
6-
kotlin("jvm") version "2.1.0"
7-
id("io.ktor.plugin") version "3.1.1"
6+
kotlin("jvm") version "2.1.20"
7+
id("io.ktor.plugin") version "3.1.2"
88
}
99

1010
group = "io.ktor.samples"

‎h2/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
kotlin.code.style=official

‎httpbin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "2.1.0"
6-
id("io.ktor.plugin") version "3.1.1"
5+
kotlin("jvm") version "2.1.20"
6+
id("io.ktor.plugin") version "3.1.2"
77
}
88

99
application {

‎httpbin/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
kotlin.code.style=official
44

‎jwt-auth-tests/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
kotlin("jvm") version "2.1.0"
3-
kotlin("plugin.serialization") version "2.1.0"
4-
id("io.ktor.plugin") version "3.1.1"
2+
kotlin("jvm") version "2.1.20"
3+
kotlin("plugin.serialization") version "2.1.20"
4+
id("io.ktor.plugin") version "3.1.2"
55
}
66

77
application {

‎ktor-client-wasm/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
compose = "1.6.2"
33
compose-plugin = "1.7.0"
44
junit = "4.13.2"
5-
kotlin = "2.1.0"
6-
ktor = "3.1.1"
5+
kotlin = "2.1.20"
6+
ktor = "3.1.2"
77

88
[libraries]
99
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

‎kweet/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ val logback_version: String by project
33
val exposed_version: String by project
44

55
plugins {
6-
kotlin("jvm") version "2.1.0"
7-
id("io.ktor.plugin") version "3.1.1"
8-
kotlin("plugin.serialization") version "2.1.0"
6+
kotlin("jvm") version "2.1.20"
7+
id("io.ktor.plugin") version "3.1.2"
8+
kotlin("plugin.serialization") version "2.1.20"
99
}
1010

1111
application {

‎kweet/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
exposed_version=0.40.1
44
kotlin.code.style=official

‎location-header/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ val kotlin_version: String by project
22
val logback_version: String by project
33

44
plugins {
5-
kotlin("jvm") version "2.1.0"
6-
id("io.ktor.plugin") version "3.1.1"
5+
kotlin("jvm") version "2.1.20"
6+
id("io.ktor.plugin") version "3.1.2"
77
}
88

99
application {

‎location-header/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
kotlin.code.style=official

‎maven-google-appengine-standard/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<artifactId>maven-google-appengine-standard</artifactId>
1212

1313
<properties>
14-
<kotlin.version>2.1.0</kotlin.version>
14+
<kotlin.version>2.1.20</kotlin.version>
1515
<slf4j.version>1.7.36</slf4j.version>
1616
<appengine.version>2.0.31</appengine.version>
1717
<servlet.version>4.0.1</servlet.version>
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>io.ktor</groupId>
3939
<artifactId>ktor-bom</artifactId>
40-
<version>3.1.1</version>
40+
<version>3.1.2</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>

‎mongodb/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ val logback_version: String by project
33
val mongodb_version: String by project
44

55
plugins {
6-
kotlin("jvm") version "2.1.0"
7-
id("io.ktor.plugin") version "3.1.1"
8-
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0"
6+
kotlin("jvm") version "2.1.20"
7+
id("io.ktor.plugin") version "3.1.2"
8+
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20"
99
}
1010

1111
group = "com.example"
@@ -32,7 +32,7 @@ dependencies {
3232
implementation("org.litote.kmongo:kmongo:$mongodb_version")
3333
testImplementation("io.ktor:ktor-server-test-host-jvm")
3434
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
35-
testImplementation("io.ktor:ktor-server-test-host-jvm:3.1.1")
35+
testImplementation("io.ktor:ktor-server-test-host-jvm:3.1.2")
3636
}
3737

3838
tasks.register("databaseInstance") {

‎mongodb/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.3.14
33
mongodb_version=4.8.0
44
kotlin.code.style=official

‎mvc-web/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ val h2_version: String by project
44
val exposed_version: String by project
55

66
plugins {
7-
kotlin("jvm") version "2.1.0"
8-
id("io.ktor.plugin") version "3.1.1"
9-
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0"
7+
kotlin("jvm") version "2.1.20"
8+
id("io.ktor.plugin") version "3.1.2"
9+
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20"
1010
}
1111

1212
group = "com.example"

‎mvc-web/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
kotlin_version=2.1.0
1+
kotlin_version=2.1.20
22
logback_version=1.4.11
33
exposed_version=0.41.1
44
h2_version=2.1.214

‎native-image-server-with-yaml-config/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val logback_version: String by project
44

55
plugins {
66
kotlin("jvm") version "2.0.10"
7-
id("io.ktor.plugin") version "3.1.1"
7+
id("io.ktor.plugin") version "3.1.2"
88
id("org.jetbrains.kotlin.plugin.serialization") version "2.0.10"
99
id("org.graalvm.buildtools.native") version "0.10.2"
1010
}

‎native-image-server-with-yaml-config/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
kotlin.code.style=official
2-
ktor_version=3.1.1
2+
ktor_version=3.1.2
33
kotlin_version=2.0.10
44
logback_version=1.4.14

‎opentelemetry/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# OpenTelemetry-Ktor Demo
22

3-
[OpenTelemetry](https://opentelemetry.io/) provides support for Ktor with the `KtorClientTracing`and `KtorServerTracing`
3+
[OpenTelemetry](https://opentelemetry.io/) provides support for Ktor with the `KtorClientTelemetry`and `KtorServerTelemetry`
44
plugins for the Ktor client and server respectively. For the source code, see
55
the [repository on GitHub](https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/ktor).
66

7-
This project contains examples of how to use the `KtorClientTracing` and `KtorServerTracing` plugins.
7+
This project contains examples of how to use the `KtorClientTelemetry` and `KtorServerTelemetry` plugins.
88

9-
You can find examples for the client plugin `KtorClientTracing` in
9+
You can find examples for the client plugin `KtorClientTelemetry` in
1010
the [extractions](./client/src/main/kotlin/opentelemetry/ktor/example/plugins/opentelemetry) folder. \
11-
And you can find examples for the server plugin `KtorServerTracing` in
11+
And you can find examples for the server plugin `KtorServerTelemetry` in
1212
the [extractions](./server/src/main/kotlin/opentelemetry/ktor/example/plugins/opentelemetry) folder.
1313

1414
## Running

‎opentelemetry/client/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ val kotlin_version: String by project
44
val opentelemetry_version: String by project
55

66
plugins {
7-
kotlin("jvm") version "2.1.0"
8-
id("io.ktor.plugin") version "3.1.1"
7+
kotlin("jvm") version "2.1.20"
8+
id("io.ktor.plugin") version "3.1.2"
99
id("application")
1010
}
1111

0 commit comments

Comments
 (0)