From 01fd97bf1ee5f8cdb8314cdee2035ffd9e64ca9a Mon Sep 17 00:00:00 2001 From: jpolchlo Date: Fri, 17 Dec 2021 15:05:45 -0500 Subject: [PATCH] =?UTF-8?q?Upgrade=20GT=20=E2=86=92=203.7.0-SNAPSHOT,=20Ge?= =?UTF-8?q?omesa=20=E2=86=92=203.2.2,=20Scala=20=E2=86=92=202.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ build.sbt | 9 +++------ project/Version.scala | 6 +++--- .../sources/ReplicationStreamBatchReader.scala | 2 +- .../MultiPolygonRelationReconstructionSpec.scala | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a5f3b86..77945ac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Upgrade to Scala 2.12; GT 3.7.0-SNAPSHOT; Geomesa Spark JTS 3.2.2 (this standardizes on JTS 1.17.0) + ### Changed ### Fixed diff --git a/build.sbt b/build.sbt index 22e0e66e..cfae82c1 100644 --- a/build.sbt +++ b/build.sbt @@ -15,9 +15,9 @@ lazy val commonSettings = Seq( cancelable in Global := true, - scalaVersion in ThisBuild := Version.scala2_11, + scalaVersion in ThisBuild := Version.scala2_12, - crossScalaVersions := Seq(Version.scala2_11, Version.scala2_12), + //crossScalaVersions := Seq(Version.scala2_12), scalacOptions := Seq( "-deprecation", @@ -40,13 +40,10 @@ lazy val commonSettings = Seq( scalacOptions in (Compile, console) ~= { _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports")) }, /* For Monocle's Lens auto-generation */ - addCompilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full), + addCompilerPlugin("org.scalamacros" %% "paradise" % "2.1.1" cross CrossVersion.full), resolvers ++= Seq( Resolver.sonatypeRepo("releases"), - Resolver.bintrayRepo("lonelyplanet", "maven"), - Resolver.bintrayRepo("kwark", "maven"), // Required for Slick 3.1.1.2, see https://github.com/azavea/raster-foundry/pull/1576 - Resolver.bintrayRepo("bkirwi", "maven"), // Required for `decline` dependency "eclipse-releases" at "https://repo.eclipse.org/content/groups/releases", "eclipse-snapshots" at "https://repo.eclipse.org/content/groups/snapshots", "geosolutions" at "http://maven.geo-solutions.it/", diff --git a/project/Version.scala b/project/Version.scala index 7f94cbd1..84815745 100644 --- a/project/Version.scala +++ b/project/Version.scala @@ -1,14 +1,14 @@ object Version { val awscala = "0.8.1" - val geotrellis = "3.5.1" + val geotrellis = "3.7.0-SNAPSHOT" val scala2_11 = "2.11.12" val scala2_12 = "2.12.12" - val geomesa = "2.2.1" + val geomesa = "3.2.2" val decline = "0.6.1" val cats = "1.6.1" val scalactic = "3.0.6" val scalatest = "3.0.3" - val spark = "2.4.4" + val spark = "2.4.7" val kryo = "4.0.2" val circe = "0.11.0" val scalaLogging = "3.9.2" diff --git a/src/main/scala/vectorpipe/sources/ReplicationStreamBatchReader.scala b/src/main/scala/vectorpipe/sources/ReplicationStreamBatchReader.scala index 252b2b4a..61fdccd3 100644 --- a/src/main/scala/vectorpipe/sources/ReplicationStreamBatchReader.scala +++ b/src/main/scala/vectorpipe/sources/ReplicationStreamBatchReader.scala @@ -8,7 +8,7 @@ import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, RowEncoder} import org.apache.spark.sql.sources.v2.reader.InputPartitionReader import scala.collection.parallel.ForkJoinTaskSupport -import scala.concurrent.forkjoin.ForkJoinPool +import java.util.concurrent.ForkJoinPool import scala.reflect.runtime.universe.TypeTag abstract class ReplicationStreamBatchReader[T <: Product: TypeTag](baseURI: URI, diff --git a/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala b/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala index 3ce6a2d0..ac596fdc 100644 --- a/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala +++ b/src/test/scala/vectorpipe/MultiPolygonRelationReconstructionSpec.scala @@ -122,7 +122,7 @@ class MultiPolygonRelationReconstructionSpec extends PropSpec with TableDrivenPr val expected = fixture.wkt.map(wktReader.read) try { - actual should ===(expected) + actual.zip(expected).forall{ case (act, exp) => if (act.isEmpty) exp.isEmpty else exp.buffer(1e-6).contains(act) } should be (true) } catch { case e: Throwable => println(s"${fixture.id} actual:")