Build: Bump scala-collection-compat from 2.12.0 to 2.13.0 (#12121)

apache · Jan 29, 2025 · e89798e · e89798e
1 parent 8e456ae
commit e89798e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 25 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -76,7 +76,7 @@ object-client-bundle = "3.3.2"
 orc = "1.9.5"
 parquet = "1.15.0"
 roaringbitmap = "1.3.0"
-scala-collection-compat = "2.12.0"
+scala-collection-compat = "2.13.0"
 slf4j = "2.0.16"
 snowflake-jdbc = "3.21.0"
 spark-hive33 = "3.3.4"

diff --git a/spark/v3.3/build.gradle b/spark/v3.3/build.gradle
@@ -59,10 +59,6 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
     implementation project(':iceberg-parquet')
     implementation project(':iceberg-arrow')
     implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}")
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
 
     compileOnly libs.errorprone.annotations
     compileOnly libs.avro.avro
@@ -141,10 +137,6 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
 
   dependencies {
     implementation "org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}"
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
     implementation libs.roaringbitmap
 
     compileOnly "org.scala-lang:scala-library"

diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
@@ -60,10 +60,6 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
     implementation project(':iceberg-arrow')
     implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}")
     implementation("org.apache.datasketches:datasketches-java:${libs.versions.datasketches.get()}")
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
 
     compileOnly libs.errorprone.annotations
     compileOnly libs.avro.avro
@@ -148,10 +144,6 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
 
   dependencies {
     implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}")
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
     implementation libs.roaringbitmap
 
     compileOnly "org.scala-lang:scala-library"

diff --git a/spark/v3.5/build.gradle b/spark/v3.5/build.gradle
@@ -60,10 +60,6 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
     implementation project(':iceberg-arrow')
     implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}")
     implementation("org.apache.datasketches:datasketches-java:${libs.versions.datasketches.get()}")
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
 
     compileOnly libs.errorprone.annotations
     compileOnly libs.avro.avro
@@ -147,10 +143,6 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
 
   dependencies {
     implementation("org.scala-lang.modules:scala-collection-compat_${scalaVersion}:${libs.versions.scala.collection.compat.get()}")
-    if (scalaVersion == '2.12') {
-      // scala-collection-compat_2.12 pulls scala 2.12.17 and we need 2.12.18 for JDK 21 support
-      implementation 'org.scala-lang:scala-library:2.12.18'
-    }
     implementation libs.roaringbitmap
 
     compileOnly "org.scala-lang:scala-library"