From cda9548de57f2ba7cd4c7619bdf350e2d7c1f63a Mon Sep 17 00:00:00 2001 From: Jolan Rensen Date: Sun, 17 Mar 2024 16:07:59 +0100 Subject: [PATCH] updating version range to 3.4.2 and 3.5.1 --- .github/workflows/build.yml | 21 ++----------------- .github/workflows/publish_dev_version.yml | 21 ++----------------- .github/workflows/publish_release_version.yml | 21 ++----------------- buildSrc/src/main/kotlin/Dependencies.kt | 1 + buildSrc/src/main/kotlin/Versions.kt | 7 ++++--- gradle.properties | 6 +++--- kotlin-spark-api/build.gradle.kts | 6 ++---- settings.gradle.kts | 4 ++-- 8 files changed, 18 insertions(+), 69 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f770318f..2619c680 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,25 +11,8 @@ jobs: timeout-minutes: 30 strategy: matrix: - scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] - exclude: - - scala: "2.13.10" - spark: "3.1.3" - - scala: "2.13.10" - spark: "3.1.2" - - scala: "2.13.10" - spark: "3.1.1" - - scala: "2.13.10" - spark: "3.1.0" - - scala: "2.13.10" - spark: "3.0.3" - - scala: "2.13.10" - spark: "3.0.2" - - scala: "2.13.10" - spark: "3.0.1" - - scala: "2.13.10" - spark: "3.0.0" + scala: [ "2.12.19", "2.13.13" ] + spark: [ "3.4.2", "3.5.1" ] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/publish_dev_version.yml b/.github/workflows/publish_dev_version.yml index 4e2ab716..403cdf72 100644 --- a/.github/workflows/publish_dev_version.yml +++ b/.github/workflows/publish_dev_version.yml @@ -9,25 +9,8 @@ jobs: build-and-deploy: strategy: matrix: - scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] - exclude: - - scala: "2.13.10" - spark: "3.1.3" - - scala: "2.13.10" - spark: "3.1.2" - - scala: "2.13.10" - spark: "3.1.1" - - scala: "2.13.10" - spark: "3.1.0" - - scala: "2.13.10" - spark: "3.0.3" - - scala: "2.13.10" - spark: "3.0.2" - - scala: "2.13.10" - spark: "3.0.1" - - scala: "2.13.10" - spark: "3.0.0" + scala: [ "2.12.19", "2.13.13" ] + spark: [ "3.4.2", "3.5.1" ] runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/publish_release_version.yml b/.github/workflows/publish_release_version.yml index ea1998ed..253a30af 100644 --- a/.github/workflows/publish_release_version.yml +++ b/.github/workflows/publish_release_version.yml @@ -8,25 +8,8 @@ jobs: build-and-deploy-mvn-central: strategy: matrix: - scala: [ "2.12.17", "2.13.10" ] - spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ] - exclude: - - scala: "2.13.10" - spark: "3.1.3" - - scala: "2.13.10" - spark: "3.1.2" - - scala: "2.13.10" - spark: "3.1.1" - - scala: "2.13.10" - spark: "3.1.0" - - scala: "2.13.10" - spark: "3.0.3" - - scala: "2.13.10" - spark: "3.0.2" - - scala: "2.13.10" - spark: "3.0.1" - - scala: "2.13.10" - spark: "3.0.0" + scala: [ "2.12.19", "2.13.13" ] + spark: [ "3.4.2", "3.5.1" ] runs-on: ubuntu-latest permissions: contents: read diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 472a18ed..225dff11 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -21,6 +21,7 @@ object Dependencies { inline val kotlinScriptingCommon get() = "org.jetbrains.kotlin:kotlin-scripting-common" inline val kotlinScriptingJvm get() = "org.jetbrains.kotlin:kotlin-scripting-jvm" inline val jacksonDatabind get() = "com.fasterxml.jackson.core:jackson-databind:${Versions.jacksonDatabind}" + inline val kotlinDateTime get() = "org.jetbrains.kotlinx:kotlinx-datetime:${Versions.kotlinxDateTime}" } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index a4042eb3..02de97c6 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,16 +1,16 @@ object Versions { const val project = "1.2.5-SNAPSHOT" const val groupID = "org.jetbrains.kotlinx.spark" - const val kotlin = "1.8.20" + const val kotlin = "1.9.22" const val jvmTarget = "8" const val jupyterJvmTarget = "8" - inline val spark get() = System.getProperty("spark") as String + inline val scala get() = System.getProperty("scala") as String inline val sparkMinor get() = spark.substringBeforeLast('.') inline val scalaCompat get() = scala.substringBeforeLast('.') - const val jupyter = "0.12.0-32-1" + const val kotest = "5.5.4" const val kotestTestContainers = "1.3.3" const val dokka = "1.8.20" @@ -23,6 +23,7 @@ object Versions { const val kotlinxHtml = "0.7.5" const val klaxon = "5.5" const val jacksonDatabind = "2.13.4.2" + const val kotlinxDateTime = "0.6.0-RC.2" inline val versionMap get() = mapOf( diff --git a/gradle.properties b/gradle.properties index bcfebf83..76e815a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ GROUP=org.jetbrains.kotlinx.spark # Controls the spark and scala version for the entire project # can also be defined like ./gradlew -Pspark=X.X.X -Pscala=X.X.X build -spark=3.3.2 -scala=2.13.10 -# scala=2.12.17 +spark=3.5.1 +scala=2.13.13 +# scala=2.12.19 skipScalaTuplesInKotlin=false org.gradle.caching=true diff --git a/kotlin-spark-api/build.gradle.kts b/kotlin-spark-api/build.gradle.kts index 2691836a..95903f6b 100644 --- a/kotlin-spark-api/build.gradle.kts +++ b/kotlin-spark-api/build.gradle.kts @@ -29,10 +29,7 @@ tasks.withType().configureEach { dependencies { with(Projects) { - api( - core, - scalaTuplesInKotlin, - ) + api(scalaTuplesInKotlin) } with(Dependencies) { @@ -46,6 +43,7 @@ dependencies { sparkSql, sparkStreaming, hadoopClient, + kotlinDateTime, ) testImplementation( diff --git a/settings.gradle.kts b/settings.gradle.kts index d0aa217b..5cfd79e6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,13 +25,13 @@ val versions = "${spark}_${scalaCompat}" rootProject.name = "kotlin-spark-api-parent_$versions" -include("core") +//include("core") include("scala-tuples-in-kotlin") include("kotlin-spark-api") include("jupyter") include("examples") -project(":core").name = "core_$versions" +//project(":core").name = "core_$versions" project(":scala-tuples-in-kotlin").name = "scala-tuples-in-kotlin_$scalaCompat" project(":kotlin-spark-api").name = "kotlin-spark-api_$versions" project(":jupyter").name = "jupyter_$versions"