Spark 4 Update

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        scala: ["2.12.20", "2.13.16"]
+        scala: ["2.13.16"]
         java: ["11", "21"]
     runs-on: ubuntu-latest
 

build.sbt

@@ -1,9 +1,9 @@
-import sbt.Keys._
+import sbt.Keys.*
 
 ThisBuild / versionScheme := Some("semver-spec")
 ThisBuild / scalaVersion := "2.13.16"
 ThisBuild / organization := "org.locationtech.geotrellis"
-ThisBuild / crossScalaVersions := List("2.13.16", "2.12.20")
+ThisBuild / crossScalaVersions := List("2.13.16")
 
 lazy val root = Project("geotrellis", file("."))
   .aggregate(

project/Boilerplate.scala

@@ -1,4 +1,4 @@
-import sbt._
+import sbt.*
 
 /**
  * Copied, with some modifications, from https://github.com/milessabin/shapeless/blob/master/project/Boilerplate.scala
@@ -8,7 +8,7 @@ import sbt._
  */
 
 object Boilerplate {
-  import scala.StringContext._
+  import scala.StringContext.*
 
   implicit final class BlockHelper(val sc: StringContext) extends AnyVal {
     def block(args: Any*): String = {

project/Dependencies.scala

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import sbt._
+import sbt.*
 
 object Version {
   val geotools    = "33.0"
@@ -28,7 +28,7 @@ object Version {
 
   val previousVersion = "3.6.0"
 }
-import sbt.Keys._
+import sbt.Keys.*
 
 object Dependencies {
   private def ver(for212: String, for213: String) = Def.setting {
@@ -63,7 +63,7 @@ object Dependencies {
   }
 
   def apacheSpark(module: String) = Def.setting {
-    "org.apache.spark"  %% s"spark-$module" % "3.5.5"
+    "org.apache.spark"  %% s"spark-$module" % "4.0.0"
   }
 
   def scalaReflect(version: String) = "org.scala-lang" % "scala-reflect" % version
@@ -85,7 +85,7 @@ object Dependencies {
   val chronoscala         = "jp.ne.opt"                  %% "chronoscala"              % "1.0.0"
   val awsSdkS3            = "software.amazon.awssdk"      % "s3"                       % "2.28.17"
   val hadoopClient        = "org.apache.hadoop"           % "hadoop-client"            % Version.hadoop
-  val avro                = "org.apache.avro"             % "avro"                     % "1.11.4" // aligned with the Spark version
+  val avro                = "org.apache.avro"             % "avro"                     % "1.11.4" // aligned with the Spark version // 1.12.0 causes test issues; 1.13.0-SNAPSHOT works
   val parserCombinators   = "org.scala-lang.modules"     %% "scala-parser-combinators" % "2.4.0"
   val jsonSchemaValidator = "com.networknt"               % "json-schema-validator"    % "0.1.23"
   val accumuloCore        = "org.apache.accumulo"         % "accumulo-core"            % Version.accumulo

project/DependencyListPlugin.scala

@@ -1,5 +1,5 @@
-import sbt._
-import sbt.Keys._
+import sbt.*
+import sbt.Keys.*
 import sbt.io.IO
 import sbt.plugins.DependencyTreeKeys.dependencyList
 import sbt.plugins.DependencyTreeSettings.targetFileAndForceParser
@@ -21,7 +21,7 @@ object DependencyListPlugin extends AutoPlugin {
   }
 
   val autoImport = Keys
-  import autoImport._
+  import autoImport.*
 
   override def projectSettings = renderingTaskSettings(dependencyListGT)
 

project/GTBenchmarkPlugin.scala

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import sbt.Keys._
-import sbt._
-import sbt.complete.DefaultParsers._
+import sbt.Keys.*
+import sbt.*
+import sbt.complete.DefaultParsers.*
 import sbt.complete.Parser
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -52,7 +52,7 @@ object GTBenchmarkPlugin extends AutoPlugin {
   }
 
   val autoImport = Keys
-  import autoImport._
+  import autoImport.*
 
   override def projectSettings = Seq(
     jmhOutputFormat := "json",

project/Settings.scala

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-import Dependencies._
-import GTBenchmarkPlugin.Keys._
-import sbt._
-import sbt.Keys._
-import sbtassembly.AssemblyPlugin.autoImport._
-import com.typesafe.tools.mima.plugin.MimaKeys._
+import Dependencies.*
+import GTBenchmarkPlugin.Keys.*
+import sbt.*
+import sbt.Keys.*
+import sbtassembly.AssemblyPlugin.autoImport.*
+import com.typesafe.tools.mima.plugin.MimaKeys.*
 import de.heikoseeberger.sbtheader.{CommentStyle, FileType}
 import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{HeaderLicense, headerLicense, headerMappings}
 import sbtprotoc.ProtocPlugin.autoImport.PB
-import mdoc.MdocPlugin.autoImport._
+import mdoc.MdocPlugin.autoImport.*
 
 import java.io.File
 

project/Unzip.scala

@@ -15,9 +15,8 @@
  */
 
 import java.util.zip.ZipFile
-import java.io.FileInputStream
 import java.io.FileOutputStream
-import scala.collection.JavaConverters._
+import scala.collection.JavaConverters.*
 import java.util.zip.ZipEntry
 import java.io.InputStream
 import java.io.OutputStream