From b76798014a827f794163ad67ea134d9a23ad87b2 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 2 Dec 2024 12:58:20 +0100 Subject: [PATCH 1/3] Update library and plugin versions Bump commonsIo to 2.18.0, mysql to 9.1.0, and kotlinLogging to 7.0.3. Update plugin-publish to 1.3.0, shadow to 8.3.5, and buildconfig to 5.5.1. --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76b203e02e..37d044aa6e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,19 +22,19 @@ deephavenCsv = "0.15.0" fastDoubleParser = "2.0.1" commonsCsv = "1.11.0" commonsCompress = "1.27.1" -commonsIo = "2.16.1" +commonsIo = "2.18.0" serialization = "1.7.1" poi = "5.3.0" mariadb = "3.4.1" h2db = "2.3.232" mssql = "12.8.1.jre11" -mysql = "9.0.0" +mysql = "9.1.0" postgresql = "42.7.4" sqlite = "3.46.1.0" jtsCore = "1.19.0" kotlinDatetime = "0.6.1" openapi = "2.1.22" -kotlinLogging = "7.0.0" +kotlinLogging = "7.0.3" sl4j = "2.0.16" junit = "4.13.2" @@ -49,13 +49,13 @@ arrow = "17.0.0" docProcessor = "0.3.10" simpleGit = "2.0.3" dependencyVersions = "0.51.0" -plugin-publish = "1.2.1" -shadow = "8.3.3" +plugin-publish = "1.3.0" +shadow = "8.3.5" android-gradle-api = "7.3.1" # Can't be updated to 7.4.0+ due to Java 8 compatibility ktor = "2.3.12" kotlin-compile-testing = "1.6.0" duckdb = "1.0.0" -buildconfig = "5.4.0" +buildconfig = "5.5.1" benchmark = "0.4.12" geotools = "32.0" From 90ef92a0c61653e19d4347f8c70faa5f919ec0a0 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 2 Dec 2024 13:17:03 +0100 Subject: [PATCH 2/3] Update dependencies to latest versions Bump various dependencies including ktlint to 12.1.2, commonsCsv to 1.12.0, openapi to 2.1.24, junit-jupiter to 5.11.3, junit-platform to 1.11.3, jsoup to 1.18.3, arrow to 18.1.0, ktor to 3.0.1, duckdb to 1.1.3, and geotools to 32.1. These updates are intended to incorporate the latest improvements and fixes from the dependency maintainers. --- gradle/libs.versions.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37d044aa6e..b82550b652 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ ksp = "2.0.20-1.0.24" kotlinJupyter = "0.12.0-139" -ktlint = "12.1.1" +ktlint = "12.1.2" # make sure to sync both manually with :generator module kotlin = "2.0.20" @@ -20,7 +20,7 @@ binaryCompatibilityValidator = "0.16.3" kover = "0.8.3" deephavenCsv = "0.15.0" fastDoubleParser = "2.0.1" -commonsCsv = "1.11.0" +commonsCsv = "1.12.0" commonsCompress = "1.27.1" commonsIo = "2.18.0" serialization = "1.7.1" @@ -33,32 +33,32 @@ postgresql = "42.7.4" sqlite = "3.46.1.0" jtsCore = "1.19.0" kotlinDatetime = "0.6.1" -openapi = "2.1.22" +openapi = "2.1.24" kotlinLogging = "7.0.3" sl4j = "2.0.16" junit = "4.13.2" -junit-jupiter = "5.11.0" -junit-platform = "1.11.0" +junit-jupiter = "5.11.3" +junit-platform = "1.11.3" # TODO 5.8.0 is not possible due to https://github.com/Kotlin/dataframe/issues/595 kotestAsserions = "5.5.4" -jsoup = "1.18.1" -arrow = "17.0.0" +jsoup = "1.18.3" +arrow = "18.1.0" docProcessor = "0.3.10" simpleGit = "2.0.3" dependencyVersions = "0.51.0" plugin-publish = "1.3.0" shadow = "8.3.5" android-gradle-api = "7.3.1" # Can't be updated to 7.4.0+ due to Java 8 compatibility -ktor = "2.3.12" +ktor = "3.0.1" kotlin-compile-testing = "1.6.0" -duckdb = "1.0.0" +duckdb = "1.1.3" buildconfig = "5.5.1" benchmark = "0.4.12" -geotools = "32.0" +geotools = "32.1" jai-core = "1.1.3" jts = "1.20.0" From 1d6f3f289f56b2968aba7682ea7d79eef2f97df6 Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Mon, 2 Dec 2024 13:24:31 +0100 Subject: [PATCH 3/3] Update library versions and adjust compatibility notes Upgraded 'dataframe' bootstrap to 0.15.0-RC2, 'mariadb' to 3.5.1, 'sqlite' to 3.47.1.0, and 'junit-bom' to 5.11.3. Added a compatibility note regarding 'simpleGit' due to Java 8 constraints. These updates ensure better performance and compatibility with recent features. --- build.gradle.kts | 2 ++ gradle/libs.versions.toml | 8 ++++---- plugins/kotlin-dataframe/build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bc0e57b193..ec90a35e42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -98,6 +98,8 @@ val dependencyUpdateExclusions = listOf( libs.android.gradle.api.get().group, // Directly dependent on the Gradle version "org.gradle.kotlin.kotlin-dsl", + // Can't be updated to 2.1.0+ due to Java 8 compatibility + libs.plugins.simpleGit.get().pluginId, ) // run `./gradlew dependencyUpdates` to check for updates diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b82550b652..f66f2251f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ libsPublisher = "1.9.23-dev-45" # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs, # dogfood Gradle / KSP plugins in tests and idea-examples modules -dataframe = "0.14.1" +dataframe = "0.15.0-RC2" korro = "0.1.6" binaryCompatibilityValidator = "0.16.3" @@ -25,12 +25,12 @@ commonsCompress = "1.27.1" commonsIo = "2.18.0" serialization = "1.7.1" poi = "5.3.0" -mariadb = "3.4.1" +mariadb = "3.5.1" h2db = "2.3.232" mssql = "12.8.1.jre11" mysql = "9.1.0" postgresql = "42.7.4" -sqlite = "3.46.1.0" +sqlite = "3.47.1.0" jtsCore = "1.19.0" kotlinDatetime = "0.6.1" openapi = "2.1.24" @@ -47,7 +47,7 @@ kotestAsserions = "5.5.4" jsoup = "1.18.3" arrow = "18.1.0" docProcessor = "0.3.10" -simpleGit = "2.0.3" +simpleGit = "2.0.3" # Can't be updated to 2.1.0+ due to Java 8 compatibility dependencyVersions = "0.51.0" plugin-publish = "1.3.0" shadow = "8.3.5" diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts index 96ef2a4827..11a6d3e7ac 100644 --- a/plugins/kotlin-dataframe/build.gradle.kts +++ b/plugins/kotlin-dataframe/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { testImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") testImplementation("org.jetbrains.kotlin:kotlin-compiler-internal-test-framework:$kotlinVersion") - testImplementation(platform("org.junit:junit-bom:5.11.0")) + testImplementation(platform("org.junit:junit-bom:5.11.3")) testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.platform:junit-platform-commons") testImplementation("org.junit.platform:junit-platform-launcher")