Skip to content

Commit 8b5964b

Browse files
committed
version bumping h2db, kotlinpoet, openapi, shadow, android-gradle(-api), ktor netty
1 parent b223146 commit 8b5964b

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

gradle/libs.versions.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ kover = "0.6.0-Beta"
1313

1414
commonsCsv = "1.8"
1515
commonsCompress = "1.21"
16-
klaxon = "5.5"
16+
klaxon = "5.5" # 5.6 requires Java 11
1717
fuel = "2.3.1"
1818
poi = "5.2.2"
1919
mariadb = "3.1.4"
20-
h2db = "2.2.220"
20+
h2db = "2.2.224"
2121
mysql = "8.0.33"
2222
postgresql = "42.6.0"
2323
sqlite = "3.42.0.1"
2424
kotlinDatetime = "0.4.0"
25-
kotlinpoet = "1.12.0"
26-
openapi = "2.1.13"
25+
kotlinpoet = "1.16.0"
26+
openapi = "2.1.20"
2727
kotlinLogging = "5.0.1"
2828
sl4j = "2.0.7"
2929

@@ -35,7 +35,9 @@ docProcessor = "0.3.2"
3535
simpleGit = "2.0.3"
3636
dependencyVersions = "0.51.0"
3737
plugin-publish = "0.15.0"
38-
shadow = "7.1.2"
38+
shadow = "8.1.1"
39+
android-gradle-api = "7.3.1"
40+
ktor-server-netty = "2.3.8"
3941

4042
[libraries]
4143
ksp-gradle = { group = "com.google.devtools.ksp", name = "symbol-processing-gradle-plugin", version.ref = "ksp" }
@@ -74,6 +76,9 @@ swagger = { group = "io.swagger.parser.v3", name = "swagger-parser", version.ref
7476

7577
kotlinLogging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" }
7678
sl4j = { group = "org.slf4j", name = "slf4j-simple", version.ref = "sl4j" }
79+
android-gradle-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "android-gradle-api" }
80+
android-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "android-gradle-api" }
81+
ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor-server-netty" }
7782

7883
[plugins]
7984
jupyter-api = { id = "org.jetbrains.kotlin.jupyter.api", version.ref = "kotlinJupyter" }

plugins/dataframe-gradle-plugin/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ dependencies {
2323
implementation(project(":dataframe-jdbc"))
2424
implementation(kotlin("gradle-plugin-api"))
2525
implementation(kotlin("gradle-plugin"))
26-
implementation("com.beust:klaxon:5.5")
26+
implementation(libs.klaxon)
2727
implementation(libs.ksp.gradle)
2828
implementation(libs.ksp.api)
2929

30-
testImplementation("junit:junit:4.13.1")
31-
testImplementation("io.kotest:kotest-assertions-core:4.6.0")
32-
testImplementation("com.android.tools.build:gradle-api:7.3.1")
33-
testImplementation("com.android.tools.build:gradle:7.3.1")
34-
testImplementation("io.ktor:ktor-server-netty:1.6.7")
30+
testImplementation(libs.junit)
31+
testImplementation(libs.kotestAssertions)
32+
testImplementation(libs.android.gradle.api)
33+
testImplementation(libs.android.gradle)
34+
testImplementation(libs.ktor.server.netty)
3535
testImplementation(libs.h2db)
3636
testImplementation(gradleApi())
3737
}

plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/EmbeddedServerRunners.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package org.jetbrains.dataframe.gradle
22

3-
import io.ktor.application.*
43
import io.ktor.http.*
5-
import io.ktor.response.*
6-
import io.ktor.routing.*
4+
import io.ktor.server.application.*
75
import io.ktor.server.engine.*
86
import io.ktor.server.netty.*
7+
import io.ktor.server.response.*
8+
import io.ktor.server.routing.*
9+
910

1011
fun useHostedJson(json: String, f: (url: String) -> Unit) {
1112
// duplicated in ksp/EmbeddedServerRunners.kt

0 commit comments

Comments
 (0)