updating some build parameters

Jolanrensen · Jolanrensen · commit 4f8d874ab623 · 2024-03-21T14:28:39.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.gradle/jdks
-          key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
+          key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
           restore-keys: |
             ${{ runner.os }}-gradle-
 
diff --git a/.github/workflows/generate_docs.yml b/.github/workflows/generate_docs.yml
@@ -26,7 +26,7 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.gradle/jdks
-          key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
+          key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
           restore-keys: |
             ${{ runner.os }}-gradle-
 
diff --git a/.github/workflows/publish_dev_version.yml b/.github/workflows/publish_dev_version.yml
@@ -33,7 +33,7 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.gradle/jdks
-          key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
+          key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -55,7 +55,7 @@ jobs:
           ./gradlew 
           -Pspark=${{ matrix.spark }} 
           -Pscala=${{ matrix.scala }} 
-          -PskipScalaTuplesInKotlin=${{ !(matrix.spark == '3.0.0' || matrix.scala == '2.13.10' && matrix.spark == '3.2.0') }} 
+          -PskipScalaOnlyDependent=${{ matrix.spark != matrix.spark[0] }}
           clean 
           publishMavenPublicationToGitHubPackagesRepository 
           --scan
diff --git a/.github/workflows/publish_release_version.yml b/.github/workflows/publish_release_version.yml
@@ -32,7 +32,7 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ~/.gradle/jdks
-          key: ${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}
+          key: "${{ runner.os }}-gradle-spark-${{ matrix.spark }}-${{ matrix.scala }}"
           restore-keys: |
             ${{ runner.os }}-gradle-
 
@@ -57,7 +57,7 @@ jobs:
           ./gradlew 
           -Pspark=${{ matrix.spark }} 
           -Pscala=${{ matrix.scala }} 
-          -PskipScalaTuplesInKotlin=${{ !(matrix.spark == '3.0.0' || matrix.scala == '2.13.10' && matrix.spark == '3.2.0') }} 
+          -PskipScalaOnlyDependent=${{ matrix.spark != matrix.spark[0] }} 
           clean 
           publishMavenPublicationToMavenCentralRepository
           --scan
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,6 @@ buildscript {
     }
 }
 
-
 plugins {
     mavenPublish version Versions.mavenPublish
     dokka version Versions.dokka
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -11,7 +11,7 @@ object Versions {
     inline val scalaCompat get() = scala.substringBeforeLast('.')
 
     // TODO
-    const val sparkConnect = false
+    inline val sparkConnect get() = System.getProperty("sparkConnect", "false").toBoolean()
 
     const val jupyter = "0.12.0-32-1"
 
@@ -39,5 +39,4 @@ object Versions {
             "version" to project,
             "sparkConnect" to sparkConnect.toString(),
         )
-
 }
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,8 @@ GROUP=org.jetbrains.kotlinx.spark
 spark=3.5.1
 scala=2.13.13
 # scala=2.12.19
-skipScalaTuplesInKotlin=false
+skipScalaOnlyDependent=false
+sparkConnect=false
 
 org.gradle.caching=true
 org.gradle.parallel=false
diff --git a/gradlew_all_versions b/gradlew_all_versions
@@ -5,10 +5,10 @@ set -euo pipefail
 # but now like `./gradlew_all_versions arguments`.
 
 DRY_RUN=${DRY_RUN:-false}
-SCALA2_12VERSION="2.12.16"
-SCALA2_13VERSION="2.13.8"
-SparkVersionsForBothScalaVersions=("3.3.0" "3.2.1" "3.2.0")
-SparkVersionsForScala2_12=("3.1.3" "3.1.2" "3.1.1" "3.1.0" "3.0.3" "3.0.2" "3.0.1" "3.0.0")
+SCALA2_12VERSION="2.12.19"
+SCALA2_13VERSION="2.13.13"
+SparkVersionsForBothScalaVersions=("3.4.2" "3.5.1")
+SparkVersionsForScala2_12=()
 
 echo Running for "$(expr ${#SparkVersionsForBothScalaVersions[@]} \* 2 + ${#SparkVersionsForScala2_12[@]}) versions of the library."
 
@@ -19,33 +19,37 @@ fi
 
 ARGS=("$@")
 execute() {
-  echo "running ./gradlew -Pspark=$SPARK -Pscala=$SCALA -PskipScalaTuplesInKotlin=$SKIP_SCALA_TUPLES -PenforceCleanJCP=true ${ARGS[*]}"
+  echo "running ./gradlew -Pspark=$SPARK -Pscala=$SCALA -PskipScalaOnlyDependent=$SKIP_SCALA_TUPLES -PenforceCleanJCP=true ${ARGS[*]}"
   if [ "$DRY_RUN" = false ]; then
-    ./gradlew -Pspark="$SPARK" -Pscala="$SCALA" -PskipScalaTuplesInKotlin="$SKIP_SCALA_TUPLES" "${ARGS[@]}"
+    ./gradlew -Pspark="$SPARK" -Pscala="$SCALA" -PskipScalaOnlyDependent="$SKIP_SCALA_TUPLES" "${ARGS[@]}"
   fi
 }
 
-SCALA="$SCALA2_12VERSION"
+#SCALA="$SCALA2_12VERSION"
 SKIP_SCALA_TUPLES=false
-for spark in "${SparkVersionsForScala2_12[@]}"; do
-  SPARK="$spark"
-  execute
-  SKIP_SCALA_TUPLES=true
-done
+#for spark in "${SparkVersionsForScala2_12[@]}"; do
+#  SPARK="$spark"
+#  execute
+#  SKIP_SCALA_TUPLES=true
+#done
 
 
 execute_for_both_scala_versions() {
   for spark in "${SparkVersionsForBothScalaVersions[@]}"; do
     SPARK="$spark"
     execute
-    SKIP_SCALA_TUPLES=true
+    if [ SPARK != "${SparkVersionsForBothScalaVersions[0]}" ]; then
+      SKIP_SCALA_TUPLES=true
+    else
+      SKIP_SCALA_TUPLES=false
+    fi
   done
 }
 SCALA="$SCALA2_12VERSION"
 execute_for_both_scala_versions
 
 SCALA="$SCALA2_13VERSION"
-SKIP_SCALA_TUPLES=false
+#SKIP_SCALA_TUPLES=false
 execute_for_both_scala_versions
 
 
diff --git a/kotlin-spark-api/build.gradle.kts b/kotlin-spark-api/build.gradle.kts
@@ -40,6 +40,8 @@ dependencies {
         // https://github.com/FasterXML/jackson-bom/issues/52
         if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
 
+        if (Versions.sparkConnect) TODO("unsupported for now")
+
         implementation(
             kotlinStdLib,
             reflect,
@@ -159,8 +161,3 @@ tasks.withType<AbstractDokkaLeafTask> {
 mavenPublishing {
     configure(KotlinJvm(Dokka("dokkaHtml")))
 }
-
-
-
-
-
diff --git a/scala-helpers/build.gradle.kts b/scala-helpers/build.gradle.kts
@@ -1,4 +1,4 @@
-@file:Suppress("UnstableApiUsage", "NOTHING_TO_INLINE")
+@file:Suppress("UnstableApiUsage")
 
 import com.igormaznitsa.jcp.gradle.JcpTask
 import com.vanniktech.maven.publish.JavaLibrary
@@ -35,7 +35,6 @@ dependencies {
     }
 }
 
-
 java {
     toolchain {
         if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
@@ -99,3 +98,8 @@ mavenPublishing {
     configure(JavaLibrary(Javadoc()))
 }
 
+// Publishing of scala-helpers can be skipped since it's only dependent on the Scala version
+val skipScalaOnlyDependent = System.getProperty("skipScalaOnlyDependent").toBoolean()
+tasks
+    .filter { "publish" in it.name }
+    .forEach { it.onlyIf { !skipScalaOnlyDependent } }
diff --git a/scala-tuples-in-kotlin/build.gradle.kts b/scala-tuples-in-kotlin/build.gradle.kts
@@ -70,8 +70,8 @@ mavenPublishing {
 
 
 // Publishing of scala-tuples-in-kotlin can be skipped since it's only dependent on the Scala version
-val skipScalaTuplesInKotlin = System.getProperty("skipScalaTuplesInKotlin").toBoolean()
+val skipScalaOnlyDependent = System.getProperty("skipScalaOnlyDependent").toBoolean()
 tasks
     .filter { "publish" in it.name }
-    .forEach { it.onlyIf { !skipScalaTuplesInKotlin } }
+    .forEach { it.onlyIf { !skipScalaOnlyDependent } }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,13 +9,12 @@ gradleEnterprise {
     }
 }
 
-
 val spark: String by settings
 val scala: String by settings
-val skipScalaTuplesInKotlin: String by settings
+val skipScalaOnlyDependent: String by settings
 System.setProperty("spark", spark)
 System.setProperty("scala", scala)
-System.setProperty("skipScalaTuplesInKotlin", skipScalaTuplesInKotlin)
+System.setProperty("skipScalaOnlyDependent", skipScalaOnlyDependent)
 
 
 val scalaCompat
@@ -31,8 +30,11 @@ include("kotlin-spark-api")
 include("jupyter")
 include("examples")
 
-project(":scala-helpers").name = "scala-helpers_$versions"
+// just scala dependent
+project(":scala-helpers").name = "scala-helpers_$scalaCompat"
 project(":scala-tuples-in-kotlin").name = "scala-tuples-in-kotlin_$scalaCompat"
+
+// spark+scala dependent
 project(":kotlin-spark-api").name = "kotlin-spark-api_$versions"
 project(":jupyter").name = "jupyter_$versions"
 project(":examples").name = "examples_$versions"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ buildscript {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`-`
`14`	`13`	`plugins {`
`15`	`14`	`mavenPublish version Versions.mavenPublish`
`16`	`15`	`dokka version Versions.dokka`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ object Versions {`
`11`	`11`	`inline val scalaCompat get() = scala.substringBeforeLast('.')`
`12`	`12`
`13`	`13`	`// TODO`
`14`		`- const val sparkConnect = false`
	`14`	`+ inline val sparkConnect get() = System.getProperty("sparkConnect", "false").toBoolean()`
`15`	`15`
`16`	`16`	`const val jupyter = "0.12.0-32-1"`
`17`	`17`
`@@ -39,5 +39,4 @@ object Versions {`
`39`	`39`	`"version" to project,`
`40`	`40`	`"sparkConnect" to sparkConnect.toString(),`
`41`	`41`	`)`
`42`		`-`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@file:Suppress("UnstableApiUsage", "NOTHING_TO_INLINE")`
	`1`	`+@file:Suppress("UnstableApiUsage")`
`2`	`2`
`3`	`3`	`import com.igormaznitsa.jcp.gradle.JcpTask`
`4`	`4`	`import com.vanniktech.maven.publish.JavaLibrary`
`@@ -35,7 +35,6 @@ dependencies {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`-`
`39`	`38`	`java {`
`40`	`39`	`toolchain {`
`41`	`40`	`if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8`
`@@ -99,3 +98,8 @@ mavenPublishing {`
`99`	`98`	`configure(JavaLibrary(Javadoc()))`
`100`	`99`	`}`
`101`	`100`
	`101`	`+// Publishing of scala-helpers can be skipped since it's only dependent on the Scala version`
	`102`	`+val skipScalaOnlyDependent = System.getProperty("skipScalaOnlyDependent").toBoolean()`
	`103`	`+tasks`
	`104`	`+ .filter { "publish" in it.name }`
	`105`	`+ .forEach { it.onlyIf { !skipScalaOnlyDependent } }`