updating gradle, fix scala plugin for 2.12 versions, jackson fix now only for spark 3.3.1

Author: Jolanrensen

core/build.gradle.kts

@@ -26,8 +26,10 @@ dependencies {
  reflect,
  )
 
+ // https://github.com/FasterXML/jackson-bom/issues/52
+ if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
+
  implementation(
- jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
  sparkSql,
  )
  }
@@ -36,14 +38,18 @@ dependencies {
 
 java {
  toolchain {
- languageVersion.set(
- JavaLanguageVersion.of(Versions.jvmTarget)
- )
+ if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
+ languageVersion.set(
+ JavaLanguageVersion.of(Versions.jvmTarget)
+ )
+ }
  }
 }
 
 tasks.withType<ScalaCompile> {
- targetCompatibility = Versions.jvmTarget
+ if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
+ targetCompatibility = Versions.jvmTarget
+ }
 }
 
 val scalaMainSources = sourceSets.main.get().scala.sourceDirectories

examples/build.gradle.kts

@@ -21,9 +21,12 @@ dependencies {
  }
 
  with(Dependencies) {
+
+ // https://github.com/FasterXML/jackson-bom/issues/52
+ if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
+
  implementation(
  sparkSql,
- jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
  sparkMl,
  sparkStreaming,
  sparkStreamingKafka,

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-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jupyter/build.gradle.kts

@@ -43,6 +43,10 @@ dependencies {
  }
 
  with(Dependencies) {
+
+ // https://github.com/FasterXML/jackson-bom/issues/52
+ if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
+
  api(
  kotlinxHtml,
  sparkSql,
@@ -52,7 +56,6 @@ dependencies {
  )
 
  implementation(
- jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
  kotlinStdLib,
  )
 

kotlin-spark-api/build.gradle.kts

@@ -35,10 +35,13 @@ dependencies {
  }
 
  with(Dependencies) {
+
+ // https://github.com/FasterXML/jackson-bom/issues/52
+ if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
+
  implementation(
  kotlinStdLib,
  reflect,
- jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
  sparkSql,
  sparkStreaming,
  hadoopClient,