WIP: Cross-compile 213

.locationtech/deploy-213.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -Eeuo pipefail
+set -x
+
+./sbt -213 "project macros" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project vector" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project proj4" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project raster" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project spark" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project spark-pipeline" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project s3" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project s3-spark" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project accumulo" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project accumulo-spark" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project hbase" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project hbase-spark" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project cassandra" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project cassandra-spark" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project geotools" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project shapefile" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project layer" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project store" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project util" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project vectortile" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project raster-testkit" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project vector-testkit" publish -no-colors -J-Drelease=locationtech \
+#  && ./sbt -213 "project spark-testkit" publish -no-colors -J-Drelease=locationtech \
+  && ./sbt -213 "project gdal" publish -no-colors -J-Drelease=locationtech

build.sbt

@@ -1,8 +1,7 @@
 import sbt.Keys._
 
-ThisBuild / scalaVersion := "2.12.13"
 ThisBuild / organization := "org.locationtech.geotrellis"
-ThisBuild / crossScalaVersions := List("2.12.13", "2.11.12")
+ThisBuild / scalaVersion := Settings.scala212
 
 lazy val root = Project("geotrellis", file("."))
   .aggregate(

layer/src/main/scala/geotrellis/layer/buffer/BufferTiles.scala

@@ -84,7 +84,7 @@ trait BufferTiles {
     addSlice(SpatialKey(col+1, row+1), TopLeft)
     addSlice(SpatialKey(col-1, row+1), TopRight)
 
-    parts
+    parts.toSeq
   }
 
   def bufferWithNeighbors[

proj4/src/main/scala/geotrellis/proj4/io/wkt/WKT.scala

@@ -22,7 +22,7 @@ import scala.io.Source
 
 object WKT {
   private val wktResourcePath = "/proj4/wkt/epsg.properties"
-  lazy val parsed: Map[Int, WktCS] = records.mapValues(WKTParser.apply)
+  lazy val parsed: Map[Int, WktCS] = records.mapValues(WKTParser.apply).toMap
   lazy val projections: Set[WktCS] = parsed.values.toSet
   lazy val records: Map[Int, String] = parseWktEpsgResource
 

proj4/src/test/scala/geotrellis/proj4/GenerateTestCases.scala

@@ -43,7 +43,7 @@ object GenerateTestCases {
           .filter { _ startsWith "<" }
           .map { s => s.tail.take(s.indexOf('>') - 1) }
           .filterNot { _ == "4326" }
-          .to[Vector]
+          .toVector
       }
     val output = new java.io.FileWriter("proj4/src/test/resources/proj4-epsg.csv");
 

proj4/src/test/scala/geotrellis/proj4/MetaCRSTestFileReader.scala

@@ -49,7 +49,7 @@ object MetaCRSTestFileReader {
       .filter(r => r.nonEmpty && !r.head.startsWith("#"))
       .drop(1)
       .map(parseTest)
-      .to[List]
+      .toList
   }
 
   private def parseTest(cols: Array[String]): MetaCRSTestCase = {

project/CrossCompileAutoPlugin.scala

@@ -0,0 +1,27 @@
+import sbt._
+import sbt.Keys._
+
+object CrossCompileAutoPlugin extends AutoPlugin {
+
+  override def trigger: sbt.PluginTrigger = allRequirements
+
+  override def projectSettings: Seq[Def.Setting[_]] =
+    Seq(
+      libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) => Seq.empty
+        case Some((2, 11 | 12)) => Seq(
+          compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
+          "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2"
+        )
+        case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}")
+      }),
+      Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) => Seq(
+          "-Ymacro-annotations", // replaces paradise in 2.13
+          "-Wconf:cat=deprecation&msg=Auto-application:silent" // there are many of these, silence until fixed
+        )
+        case Some((2, 11 | 12)) => Seq("-Ypartial-unification") // required by Cats
+        case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}")
+      })
+    )
+}

project/Dependencies.scala

@@ -18,7 +18,6 @@ import sbt._
 
 object Version {
   val geotools    = "24.2"
-  val spire       = "0.13.0"
   val accumulo    = "1.9.3"
   val cassandra   = "3.7.2"
   val hbase       = "2.2.5"
@@ -34,11 +33,13 @@ object Version {
 import sbt.Keys._
 
 object Dependencies {
-  private def ver(for211: String, for212: String) = Def.setting {
+
+  private def ver(for211: String, for212: String, for213: Option[String] = None) = Def.setting {
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, 11)) => for211
       case Some((2, 12)) => for212
-      case _ => sys.error("not good")
+      case Some((2, 13)) => for213.getOrElse(for212)
+      case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}")
     }
   }
 
@@ -67,6 +68,15 @@ object Dependencies {
 
   def scalaReflect(version: String) = "org.scala-lang" % "scala-reflect" % version
 
+  def spire(module: String) = Def.setting {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 11)) => "org.spire-math" %% "spire" % "0.13.0"
+      case Some((2, 12)) => "org.spire-math" %% "spire" % "0.13.0" // 0.17.0 exists for 2.12
+      case Some((2, 13)) => "org.typelevel"  %% "spire" % "0.17.0"
+      case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}")
+    }
+  }
+
   val sparkCore           = "org.apache.spark"           %% "spark-core"               % Version.spark
   val sparkSql            = "org.apache.spark"           %% "spark-sql"                % Version.spark
   val pureconfig          = "com.github.pureconfig"      %% "pureconfig"               % "0.14.0"
@@ -77,8 +87,6 @@ object Dependencies {
   val jts                 = "org.locationtech.jts"        % "jts-core"                 % "1.17.1"
   val proj4j              = "org.locationtech.proj4j"     % "proj4j"                   % "1.1.1"
   val openCSV             = "com.opencsv"                 % "opencsv"                  % "5.3"
-  val spire               = "org.spire-math"             %% "spire"                    % Version.spire
-  val spireMacro          = "org.spire-math"             %% "spire-macros"             % Version.spire
   val apacheIO            = "commons-io"                  % "commons-io"               % "2.8.0"
   val apacheLang3         = "org.apache.commons"          % "commons-lang3"            % "3.12.0"
   val apacheMath          = "org.apache.commons"          % "commons-math3"            % "3.6.1"

project/Settings.scala

@@ -17,7 +17,7 @@
 import Dependencies._
 import GTBenchmarkPlugin.Keys._
 import sbt._
-import sbt.Keys._
+import sbt.Keys.{crossScalaVersions, _}
 import sbtassembly.AssemblyPlugin.autoImport._
 import com.typesafe.tools.mima.plugin.MimaKeys._
 import de.heikoseeberger.sbtheader.{CommentStyle, FileType}
@@ -40,12 +40,19 @@ object Settings {
     val all             = external ++ local
   }
 
+  lazy val scala211 = "2.11.12"
+  lazy val scala212 = "2.12.13"
+  lazy val scala213 = "2.13.5"
+
+  lazy val crossScalaVersionsAll = List(scala213, scala212, scala211)
+  lazy val crossScalaVersionsSparkOnly = List(scala212, scala211)
+
   lazy val noForkInTests = Seq(
     Test / fork := false,
     Test / parallelExecution := false
   )
 
-  val commonScalacOptions = Seq(
+  lazy val commonScalacOptions = Seq(
     "-deprecation",
     "-unchecked",
     "-feature",
@@ -56,16 +63,17 @@ object Settings {
     "-language:existentials",
     "-language:experimental.macros",
     "-feature",
-    "-Ypartial-unification", // required by Cats
     // "-Yrangepos",            // required by SemanticDB compiler plugin
     // "-Ywarn-unused-import",  // required by `RemoveUnused` rule
-    "-target:jvm-1.8")
+    "-target:jvm-1.8"
+  )
 
   lazy val commonSettings = Seq(
     description := "geographic data processing library for high performance applications",
     licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),
     homepage := Some(url("https://geotrellis.io")),
     scmInfo := Some(ScmInfo(url("https://github.com/locationtech/geotrellis"), "scm:git:[email protected]:locationtech/geotrellis.git")),
+    crossScalaVersions := crossScalaVersionsAll,
     scalacOptions ++= commonScalacOptions,
     publishMavenStyle := true,
     Test / publishArtifact := false,
@@ -93,7 +101,6 @@ object Settings {
     ).filter(_.asFile.canRead).map(Credentials(_)),
 
     addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.3" cross CrossVersion.full),
-    addCompilerPlugin("org.scalamacros" %% "paradise" % "2.1.1" cross CrossVersion.full),
     addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.4.10" cross CrossVersion.full),
 
     pomExtra := (
@@ -121,7 +128,11 @@ object Settings {
           existingText.flatMap(_ => existingText.map(_.trim)).getOrElse(newText)
         } }
       )
-    )
+    ),
+    evictionWarningOptions in update := EvictionWarningOptions.default
+      .withWarnTransitiveEvictions(false)
+      .withWarnDirectEvictions(false)
+      .withWarnScalaVersionEviction(false)
   )
 
   lazy val accumulo = Seq(
@@ -144,6 +155,7 @@ object Settings {
 
   lazy val `accumulo-spark` = Seq(
     name := "geotrellis-accumulo-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       accumuloCore
         exclude("org.jboss.netty", "netty")
@@ -166,6 +178,7 @@ object Settings {
   ) ++ commonSettings ++ noForkInTests
 
   lazy val bench = Seq(
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies += sl4jnop,
     jmhIterations := Some(5),
     jmhTimeUnit := None, // Each benchmark should determing the appropriate time unit.
@@ -196,6 +209,7 @@ object Settings {
 
   lazy val `cassandra-spark` = Seq(
     name := "geotrellis-cassandra-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       cassandraDriverCore
         excludeAll(
@@ -223,6 +237,7 @@ object Settings {
 
   lazy val `doc-examples` = Seq(
     name := "geotrellis-doc-examples",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     scalacOptions ++= commonScalacOptions,
     libraryDependencies ++= Seq(
       sparkCore,
@@ -376,6 +391,7 @@ object Settings {
 
   lazy val `hbase-spark` = Seq(
     name := "geotrellis-hbase-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       hadoopClient % Provided,
       sparkCore % Provided,
@@ -399,7 +415,7 @@ object Settings {
     name := "geotrellis-macros",
     Compile / sourceGenerators += (Compile / sourceManaged).map(Boilerplate.genMacro).taskValue,
     libraryDependencies ++= Seq(
-      spireMacro,
+      spire("spire-macros").value,
       scalaReflect(scalaVersion.value)
     )
   ) ++ commonSettings
@@ -410,7 +426,8 @@ object Settings {
     mdocOut := new File("website/docs"),
     mdocVariables := Map(
       "VERSION" -> (ThisBuild / version).value
-    )
+    ),
+    crossScalaVersions := crossScalaVersionsSparkOnly
   )
 
   lazy val proj4 = Seq(
@@ -430,7 +447,7 @@ object Settings {
     name := "geotrellis-raster",
     libraryDependencies ++= Seq(
       squants,
-      monocle("core").value, 
+      monocle("core").value,
       monocle("macro").value,
       scalaXml,
       scalaURI.value,
@@ -497,6 +514,7 @@ object Settings {
 
   lazy val `s3-spark` = Seq(
     name := "geotrellis-s3-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       hadoopClient % Provided,
       sparkCore % Provided,
@@ -533,6 +551,7 @@ object Settings {
 
   lazy val spark = Seq(
     name := "geotrellis-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       sparkCore % Provided,
       hadoopClient % Provided,
@@ -556,7 +575,8 @@ object Settings {
 
   lazy val `spark-pipeline` = Seq(
     name := "geotrellis-spark-pipeline",
-    libraryDependencies ++= Seq(   
+    crossScalaVersions := crossScalaVersionsSparkOnly,
+    libraryDependencies ++= Seq(
       circe("generic-extras").value,
       hadoopClient % Provided,
       sparkCore % Provided,
@@ -587,6 +607,7 @@ object Settings {
 
   lazy val `spark-testkit` = Seq(
     name := "geotrellis-spark-testkit",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       hadoopClient % Provided,
       sparkCore % Provided,
@@ -600,19 +621,20 @@ object Settings {
     libraryDependencies ++= Seq(
       log4s,
       scalaj,
-      spire,
+      spire("spire").value,
       scalatest % Test
     )
   ) ++ commonSettings
 
   lazy val vector = Seq(
     name := "geotrellis-vector",
     libraryDependencies ++= Seq(
+      scalaReflect(scalaVersion.value),
       jts,
       shapeless,
       pureconfig,
-      circe("core").value, 
-      circe("generic").value, 
+      circe("core").value,
+      circe("generic").value,
       circe("parser").value,
       cats("core").value,
       apacheMath,
@@ -669,7 +691,7 @@ object Settings {
       uzaygezenCore,
       scalaXml,
       apacheLang3,
-      fs2("core").value, 
+      fs2("core").value,
       fs2("io").value,
       cats("effect").value,
       scalatest % Test
@@ -691,6 +713,7 @@ object Settings {
 
   lazy val `gdal-spark` = Seq(
     name := "geotrellis-gdal-spark",
+    crossScalaVersions := crossScalaVersionsSparkOnly,
     libraryDependencies ++= Seq(
       gdalWarp,
       hadoopClient % Provided,

publish/publish-to-sonatype-213.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Publish to sonatype for all supported scala version 2.13
+
+set -Eeuo pipefail
+set -x
+
+./sbt -213 publishSigned -no-colors -J-Drelease=sonatype

raster/src/main/scala/geotrellis/raster/GridBounds.scala

@@ -162,7 +162,7 @@ case class GridBounds[@specialized(Int, Long) N: Integral](
       if(overlapRowMax < rowMax) {
         result += GridBounds(overlapColMin, overlapRowMax + 1, overlapColMax, rowMax)
       }
-      result
+      result.toSeq
     }
 
   /**