From 0513c207785dfbf02563f056cbebd810c32a6f3a Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Thu, 8 Apr 2021 17:21:43 -0400 Subject: [PATCH] Fix Raster tests --- build.sbt | 2 +- project/Settings.scala | 7 +++---- .../raster/geotiff/GeoTiffReprojectRasterSourceSpec.scala | 7 ++++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 1abd4a845f..95fa0923a9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import sbt.Keys._ -ThisBuild / scalaVersion := "2.12.13" +ThisBuild / scalaVersion := "2.13.5" ThisBuild / organization := "org.locationtech.geotrellis" ThisBuild / crossScalaVersions := List("2.12.13", "2.13.5") diff --git a/project/Settings.scala b/project/Settings.scala index 1cab8bb551..742d4dd36c 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -110,6 +110,8 @@ object Settings { case x => sys.error(s"Encountered unsupported Scala version ${x.getOrElse("undefined")}") }), + libraryDependencies += scalaReflect(scalaVersion.value), + pomExtra := ( @@ -418,10 +420,7 @@ object Settings { lazy val macros = Seq( name := "geotrellis-macros", Compile / sourceGenerators += (Compile / sourceManaged).map(Boilerplate.genMacro).taskValue, - libraryDependencies ++= Seq( - spireMacro, - scalaReflect(scalaVersion.value) - ) + libraryDependencies += spireMacro ) ++ commonSettings lazy val mdoc = Seq( diff --git a/raster/src/test/scala/geotrellis/raster/geotiff/GeoTiffReprojectRasterSourceSpec.scala b/raster/src/test/scala/geotrellis/raster/geotiff/GeoTiffReprojectRasterSourceSpec.scala index 1a633d64e1..94d957d9f9 100644 --- a/raster/src/test/scala/geotrellis/raster/geotiff/GeoTiffReprojectRasterSourceSpec.scala +++ b/raster/src/test/scala/geotrellis/raster/geotiff/GeoTiffReprojectRasterSourceSpec.scala @@ -53,7 +53,12 @@ class GeoTiffReprojectRasterSourceSpec extends AnyFunSpec with RasterMatchers wi warpRasterSource.resolutions.size shouldBe rasterSource.resolutions.size - val testBounds = GridBounds(0, 0, expectedRasterExtent.cols, expectedRasterExtent.rows).toGridType[Long].split(64, 64).toSeq + val testBounds = + GridBounds(0, 0, expectedRasterExtent.cols, expectedRasterExtent.rows) + .toGridType[Long] + .split(64, 64) + .take(5) // speedup tests + .toList for (bound <- testBounds) yield { withClue(s"Read window ${bound}: ") {