Skip to content

Commit 53c7c5b

Browse files
authored
Merge pull request #848 from Kotlin/0.14-version-bumps
0.14 version bumps
2 parents fa70ab2 + 352929e commit 53c7c5b

File tree

5 files changed

+32
-38
lines changed

5 files changed

+32
-38
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ val dependencyUpdateExclusions = listOf(
8686
libs.kotestAssertions.get().name,
8787
// Can't be updated to 7.4.0+ due to Java 8 compatibility
8888
libs.android.gradle.api.get().group,
89-
// TODO 0.1.6 broke kotlinter, https://github.com/Kotlin/dataframe/issues/598
90-
libs.plugins.korro.get().pluginId,
9189
// Directly dependent on the Gradle version
9290
"org.gradle.kotlin.kotlin-dsl",
9391
)

generator/gradle.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
kotlinCompilerVersion=2.0.0
2-
3-
# 1.15.0+ breaks with NoSuchMethodException: 'java.io.File com.squareup.kotlinpoet.FileSpec.writeTo(java.io.File)'
4-
kotlinPoetVersion=1.14.2
1+
kotlinCompilerVersion=2.0.20
2+
kotlinPoetVersion=1.18.1

gradle/libs.versions.toml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,61 @@
11
[versions]
2-
ksp = "2.0.0-1.0.23"
2+
ksp = "2.0.20-1.0.24"
33
kotlinJupyter = "0.12.0-139"
44

55
ktlint = "12.1.1"
66

7-
# make sure to sync manually with :generator module
8-
kotlin = "2.0.0"
9-
kotlinpoet = "1.16.0"
10-
dokka = "1.9.10"
7+
# make sure to sync both manually with :generator module
8+
kotlin = "2.0.20"
9+
kotlinpoet = "1.18.1"
1110

12-
libsPublisher = "1.8.10-dev-43"
11+
dokka = "1.9.20"
12+
libsPublisher = "1.9.23-dev-45"
1313

1414
# "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
1515
# dogfood Gradle / KSP plugins in tests and idea-examples modules
1616
dataframe = "0.13.1"
17-
18-
# TODO 0.1.6 breaks kotlinter (which is no longer in use), https://github.com/Kotlin/dataframe/issues/598
19-
korro = "0.1.5"
17+
korro = "0.1.6"
2018

2119
# TODO Requires more work to be updated to 0.7.0+
2220
# https://github.com/Kotlin/dataframe/issues/594
2321
kover = "0.6.1"
2422

25-
commonsCsv = "1.10.0"
26-
commonsCompress = "1.26.0"
23+
commonsCsv = "1.11.0"
24+
commonsCompress = "1.27.1"
2725
commonsIo = "2.16.1"
28-
serialization = "1.7.0"
26+
serialization = "1.7.1"
2927
fuel = "2.3.1"
30-
poi = "5.2.5"
31-
mariadb = "3.3.2"
32-
h2db = "2.3.230"
33-
mssql = "12.6.3.jre11"
28+
poi = "5.3.0"
29+
mariadb = "3.4.1"
30+
h2db = "2.3.232"
31+
mssql = "12.8.1.jre11"
3432
mysql = "9.0.0"
35-
postgresql = "42.7.3"
36-
sqlite = "3.45.3.0"
37-
jtsCore = "1.18.1"
38-
kotlinDatetime = "0.6.0"
39-
openapi = "2.1.20"
33+
postgresql = "42.7.4"
34+
sqlite = "3.46.1.0"
35+
jtsCore = "1.19.0"
36+
kotlinDatetime = "0.6.1"
37+
openapi = "2.1.22"
4038
kotlinLogging = "7.0.0"
41-
sl4j = "2.0.12"
39+
sl4j = "2.0.16"
4240

4341
junit = "4.13.2"
44-
junit-jupiter = "5.10.2"
45-
junit-platform = "1.10.2"
42+
junit-jupiter = "5.11.0"
43+
junit-platform = "1.11.0"
4644

4745
# TODO 5.8.0 is not possible due to https://github.com/Kotlin/dataframe/issues/595
4846
kotestAsserions = "5.5.4"
4947

50-
jsoup = "1.17.2"
51-
arrow = "15.0.0"
48+
jsoup = "1.18.1"
49+
arrow = "17.0.0"
5250
docProcessor = "0.3.10"
5351
simpleGit = "2.0.3"
5452
dependencyVersions = "0.51.0"
5553
plugin-publish = "1.2.1"
5654
shadow = "8.1.1"
5755
android-gradle-api = "7.3.1" # Can't be updated to 7.4.0+ due to Java 8 compatibility
58-
ktor-server-netty = "2.3.8"
56+
ktor-server-netty = "2.3.12"
5957
kotlin-compile-testing = "1.6.0"
60-
duckdb = "0.10.0"
58+
duckdb = "1.0.0"
6159
buildconfig = "5.4.0"
6260

6361
[libraries]

plugins/kotlin-dataframe/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id("java")
66
kotlin("jvm")
77
kotlin("libs.publisher")
8-
id("com.github.johnrengelman.shadow") version "7.1.2"
8+
id("com.github.johnrengelman.shadow") version "8.1.1"
99
kotlin("plugin.serialization")
1010
}
1111

@@ -42,12 +42,12 @@ dependencies {
4242
implementation(project(":core"))
4343
implementation(project(":dataframe-excel"))
4444
api(libs.kotlinLogging)
45-
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0-RC")
45+
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
4646

4747
testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
4848
testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$kotlinVersion")
4949

50-
testImplementation(platform("org.junit:junit-bom:5.8.0"))
50+
testImplementation(platform("org.junit:junit-bom:5.11.0"))
5151
testImplementation("org.junit.jupiter:junit-jupiter")
5252
testImplementation("org.junit.platform:junit-platform-commons")
5353
testImplementation("org.junit.platform:junit-platform-launcher")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
kotlin.code.style=official
2-
kotlinVersion=2.0.20-RC2
2+
kotlinVersion=2.0.20

0 commit comments

Comments
 (0)