diff --git a/dataframe-jupyter/build.gradle.kts b/dataframe-jupyter/build.gradle.kts index 00723fc9c1..defa31889e 100644 --- a/dataframe-jupyter/build.gradle.kts +++ b/dataframe-jupyter/build.gradle.kts @@ -20,6 +20,8 @@ repositories { mavenCentral() } +fun ExternalModuleDependency.excludeDataFrame() = exclude("org.jetbrains.kotlinx", "dataframe") + dependencies { api(projects.dataframe) @@ -36,12 +38,10 @@ dependencies { testImplementation(projects.dataframeJupyter) testImplementation(projects.dataframeGeoJupyter) - testImplementation(libs.kandy.notebook) { - exclude("org.jetbrains.kotlinx", "dataframe") - } - testImplementation(libs.kandy.stats) { - exclude("org.jetbrains.kotlinx", "dataframe") - } + + testImplementation(libs.kandy) { excludeDataFrame() } + testImplementation(libs.kandy.geo) { excludeDataFrame() } + testImplementation(libs.kandy.stats) { excludeDataFrame() } testImplementation(libs.kotestAssertions) { exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 152eca7023..7cb32787c7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,12 +62,8 @@ geotools = "33.2" jai-core = "1.1.3" jts = "1.20.0" -# Normal examples Kandy versions -kandy = "0.8.2-dev-90" - -# Example notebooks Kandy versions -kandy-notebook = "0.8.1n" -kandy-stats-notebook = "0.5.0n" +kandy = "0.8.3-dev-92" +kandy-stats= "0.5.1-dev-2" exposed = "1.0.0-beta-2" hibernate = "6.5.2.Final" @@ -106,14 +102,10 @@ mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql" postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "postgresql" } sqlite = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqlite" } -# Example notebooks Kandy versions -kandy-notebook = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy-notebook" } -# -- Requires repo: https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven -kandy-stats = { group = "org.jetbrains.kotlinx", name = "kotlin-statistics-jvm", version.ref = "kandy-stats-notebook" } - -# Normal examples Kandy versions kandy = { group = "org.jetbrains.kotlinx", name = "kandy-lets-plot", version.ref = "kandy" } +kandy-geo = { group = "org.jetbrains.kotlinx", name = "kandy-geo", version.ref = "kandy" } kandy-samples-utils = { group = "org.jetbrains.kotlinx", name = "kandy-samples-utils", version.ref = "kandy" } +kandy-stats = { group = "org.jetbrains.kotlinx", name = "kotlin-statistics-jvm", version.ref = "kandy-stats" } poi-ooxml = { group = "org.apache.poi", name = "poi-ooxml", version.ref = "poi" } kotlin-datetimeJvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime-jvm", version.ref = "kotlinDatetime" }