Merge pull request #343 from Kotlin/version-bumps

Version bumps and dependency fixes

Author: Jolanrensen

build.gradle.kts

@@ -36,9 +36,9 @@ dependencies {
     api(project(":core"))
     api(project(":dataframe-arrow"))
     api(project(":dataframe-excel"))
+    api(project(":dataframe-openapi"))
 }
 
-
 allprojects {
     tasks.withType<KotlinCompile> {
         kotlinOptions {

core/build.gradle.kts

@@ -1,6 +1,8 @@
+import com.google.devtools.ksp.gradle.KspTaskJvm
 import nl.jolanrensen.docProcessor.defaultProcessors.*
 import nl.jolanrensen.docProcessor.gradle.creatingProcessDocTask
 import org.gradle.jvm.tasks.Jar
+import org.jmailen.gradle.kotlinter.tasks.LintTask
 import xyz.ronella.gradle.plugin.simple.git.task.GitTask
 
 @Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
@@ -176,7 +178,21 @@ kotlinter {
     )
 }
 
-tasks.withType<org.jmailen.gradle.kotlinter.tasks.LintTask> {
+tasks.withType<KspTaskJvm> {
+    dependsOn(tasks.generateKeywordsSrc)
+}
+
+tasks.lintKotlinMain {
+    dependsOn(tasks.generateKeywordsSrc)
+    dependsOn("kspKotlin")
+}
+
+tasks.lintKotlinTest {
+    dependsOn(tasks.generateKeywordsSrc)
+    dependsOn("kspTestKotlin")
+}
+
+tasks.withType<LintTask> {
     exclude("**/*keywords*/**")
     exclude {
         it.name.endsWith(".Generated.kt")

dataframe-openapi/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlinpoet)
-    implementation(libs.swagger)
+    api(libs.swagger)
 
     testApi(project(":core"))
     testImplementation(libs.junit)

examples/idea-examples/json/build.gradle.kts

@@ -8,15 +8,15 @@ plugins {
 }
 
 repositories {
-    mavenLocal()
+    mavenLocal() // in case of local dataframe development
     mavenCentral()
 }
 
 kotlin.sourceSets.getByName("main").kotlin.srcDir("build/generated/ksp/main/kotlin/")
 
 dependencies {
-    implementation(project(":core"))
-    implementation(project(":dataframe-openapi"))
+    // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z")
+    implementation(project(":"))
 }
 
 tasks.withType<KotlinCompile> {

examples/idea-examples/movies/build.gradle.kts

@@ -8,14 +8,16 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal() // in case of local dataframe development
 }
 
 kotlin.sourceSets.getByName("main").kotlin.srcDir("build/generated/ksp/main/kotlin/")
 
 application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.movies.MoviesWithDataClassKt")
 
 dependencies {
-    implementation(project(":core"))
+    // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z")
+    implementation(project(":"))
 }
 
 tasks.withType<KotlinCompile> {

examples/idea-examples/titanic/build.gradle.kts

@@ -6,12 +6,14 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal() // in case of local dataframe development
 }
 
 application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.titanic.ml.TitanicKt")
 
 dependencies {
-    implementation(project(":core"))
+    // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z")
+    implementation(project(":"))
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-api:0.5.1")
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-impl:0.5.1")
     implementation("org.jetbrains.kotlinx:kotlin-deeplearning-tensorflow:0.5.1")

examples/idea-examples/youtube/build.gradle.kts

@@ -8,14 +8,16 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal() // in case of local dataframe development
 }
 
 kotlin.sourceSets.getByName("main").kotlin.srcDir("build/generated/ksp/main/kotlin/")
 
 application.mainClass.set("org.jetbrains.kotlinx.dataframe.examples.youtube.YoutubeKt")
 
 dependencies {
-    implementation(project(":core"))
+    // implementation("org.jetbrains.kotlinx:dataframe:X.Y.Z")
+    implementation(project(":"))
     implementation(libs.kotlin.datetimeJvm)
 }
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-ksp = "1.8.20-Beta-1.0.9"
+ksp = "1.8.20-1.0.10"
 kotlinJupyter = "0.11.0-311"
 ktlint = "3.4.5"
-kotlin = "1.8.20-Beta"
+kotlin = "1.8.20"
 dokka = "1.8.10"
 libsPublisher = "0.0.60-dev-30"
 # "Bootstrap" version of the dataframe, used in the build itself to generate @DataSchema APIs,
@@ -18,7 +18,7 @@ fuel = "2.3.1"
 poi = "5.2.2"
 kotlinDatetime = "0.4.0"
 kotlinpoet = "1.12.0"
-openapi = "2.1.2"
+openapi = "2.1.13"
 
 junit = "4.13.2"
 kotestAsserions = "4.6.3"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -25,7 +25,7 @@ dependencies {
     implementation(libs.ksp.gradle)
     implementation(libs.ksp.api)
 
-    testImplementation("junit:junit:4.12")
+    testImplementation("junit:junit:4.13.1")
     testImplementation("io.kotest:kotest-assertions-core:4.6.0")
     testImplementation("com.android.tools.build:gradle-api:7.3.1")
     testImplementation("com.android.tools.build:gradle:7.3.1")