Update SBT up to 1.4.6, upd GitHub Actions (#51)

Author: pomadchin

.github/workflows/actions.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.3, 2.12.12]
+        scala: [2.13.4, 2.12.12]
 
     container:
       image: daunnc/pdal-ubuntu:2.2.0
@@ -19,19 +19,19 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Cache SBT ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/build.sbt') }}
 
       - name: Cache SBT coursier cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.cache
+          path: ~/.cache/coursier/v1
           key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/build.sbt') }}
 
       - name: Cache SBT
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
@@ -50,32 +50,32 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        scala: [2.13.3, 2.12.12]
+        scala: [2.13.4, 2.12.12]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Cache SBT ivy cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-sbt-ivy-cache-${{ hashFiles('**/build.sbt') }}
 
       - name: Cache SBT coursier cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.coursier
+          path: ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-coursier-cache-${{ hashFiles('**/build.sbt') }}
 
       - name: Cache SBT
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
 
       - name: Cache Homebrew
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/Library/Caches/Homebrew
           key: ${{ runner.os }}-homebrew

.gitignore

@@ -34,14 +34,20 @@ README.html
 *.sublime-workspace
 
 # VSCode files
+
 .vscode
 .history
 
 # Metals
+
 .metals
 .bloop
 metals.sbt
 
+# SBT
+
+.bsp
+
 # Test data files #
 
 java/data

build.sbt

@@ -2,8 +2,8 @@ name := "pdal-jni"
 
 lazy val commonSettings = Seq(
   version := "2.2.1" + Environment.versionSuffix,
-  scalaVersion := "2.13.3",
-  crossScalaVersions := Seq("2.13.3", "2.12.12", "2.11.12"),
+  scalaVersion := "2.13.4",
+  crossScalaVersions := Seq("2.13.4", "2.12.12", "2.11.12"),
   organization := "io.pdal",
   description := "PDAL JNI bindings",
   licenses := Seq("BSD" -> url("https://github.com/PDAL/PDAL/blob/master/LICENSE.txt")),

core/src/test/scala/io/pdal/PipelineSpec.scala

@@ -169,7 +169,7 @@ class PipelineSpec extends TestEnvironmentSpec {
     it("should read crs correct") {
       val pvi = pipeline.getPointViews()
       val pv = pvi.next()
-      pv.getCrsProj4 should (be (proj4String) or be(proj4StringNew))
+      pv.getCrsProj4 should (be (proj4String) or be(proj4StringMac))
       pv.close()
       pvi.close()
     }

core/src/test/scala/io/pdal/TestEnvironmentSpec.scala

@@ -61,8 +61,8 @@ trait TestEnvironmentSpec extends AnyFunSpec with Matchers with BeforeAndAfterAl
       |}
      """.stripMargin
 
-  val proj4String    = "+proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=400000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
-  val proj4StringNew = "+proj=lcc +lat_0=41.75 +lon_0=-120.5 +lat_1=43 +lat_2=45.5 +x_0=400000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
+  val proj4String    = "+proj=lcc +lat_0=41.75 +lon_0=-120.5 +lat_1=43 +lat_2=45.5 +x_0=400000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"
+  val proj4StringMac = "+proj=lcc +lat_0=41.75 +lon_0=-120.5 +lat_1=43 +lat_2=45.5 +x_0=400000 +y_0=0 +ellps=GRS80 +units=m +no_defs"
 
   val pipeline: Pipeline         = Pipeline(json)
   val pipelineDelaunay: Pipeline = Pipeline(jsonDelaunay)

examples/pdal-jni/sbt

@@ -34,10 +34,10 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.3.13"
-declare -r sbt_unreleased_version="1.4.0-RC1"
+declare -r sbt_release_version="1.4.6"
+declare -r sbt_unreleased_version="1.4.6"
 
-declare -r latest_213="2.13.3"
+declare -r latest_213="2.13.4"
 declare -r latest_212="2.12.12"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
@@ -247,11 +247,18 @@ java_version() {
   echo "$version"
 }
 
+is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]; }
+
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
 default_jvm_opts() {
   local -r v="$(java_version)"
   if [[ $v -ge 10 ]]; then
-    echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
+    if is_apple_silicon; then
+      # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
+      echo "$default_jvm_opts_common"
+    else
+      echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
+    fi
   elif [[ $v -ge 8 ]]; then
     echo "$default_jvm_opts_common"
   else
@@ -471,7 +478,7 @@ process_args() {
       -trace)       require_arg integer "$1" "$2" && trace_level="$2" && shift 2 ;;
       -debug-inc)   addJava "-Dxsbt.inc.debug=true" && shift ;;
 
-      -no-colors)   addJava "-Dsbt.log.noformat=true" && shift ;;
+      -no-colors)   addJava "-Dsbt.log.noformat=true" && addJava "-Dsbt.color=false" && shift ;;
       -sbt-create)  sbt_create=true && shift ;;
       -sbt-dir)     require_arg path "$1" "$2" && sbt_dir="$2" && shift 2 ;;
       -sbt-boot)    require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;

project/Dependencies.scala

@@ -45,5 +45,5 @@ object Dependencies {
   )
 
   val jtsCore   = "org.locationtech.jts" % "jts-core"  % "1.16.1"
-  val scalaTest = "org.scalatest"       %% "scalatest" % "3.2.2"
+  val scalaTest = "org.scalatest"       %% "scalatest" % "3.2.3"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.4.6

sbt

@@ -34,10 +34,10 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.3.13"
-declare -r sbt_unreleased_version="1.4.0-RC1"
+declare -r sbt_release_version="1.4.6"
+declare -r sbt_unreleased_version="1.4.6"
 
-declare -r latest_213="2.13.3"
+declare -r latest_213="2.13.4"
 declare -r latest_212="2.12.12"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
@@ -247,11 +247,18 @@ java_version() {
   echo "$version"
 }
 
+is_apple_silicon() { [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "arm64" ]]; }
+
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
 default_jvm_opts() {
   local -r v="$(java_version)"
   if [[ $v -ge 10 ]]; then
-    echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
+    if is_apple_silicon; then
+      # As of Dec 2020, JVM for Apple Silicon (M1) doesn't support JVMCI
+      echo "$default_jvm_opts_common"
+    else
+      echo "$default_jvm_opts_common -XX:+UnlockExperimentalVMOptions -XX:+UseJVMCICompiler"
+    fi
   elif [[ $v -ge 8 ]]; then
     echo "$default_jvm_opts_common"
   else
@@ -471,7 +478,7 @@ process_args() {
       -trace)       require_arg integer "$1" "$2" && trace_level="$2" && shift 2 ;;
       -debug-inc)   addJava "-Dxsbt.inc.debug=true" && shift ;;
 
-      -no-colors)   addJava "-Dsbt.log.noformat=true" && shift ;;
+      -no-colors)   addJava "-Dsbt.log.noformat=true" && addJava "-Dsbt.color=false" && shift ;;
       -sbt-create)  sbt_create=true && shift ;;
       -sbt-dir)     require_arg path "$1" "$2" && sbt_dir="$2" && shift 2 ;;
       -sbt-boot)    require_arg path "$1" "$2" && addJava "-Dsbt.boot.directory=$2" && shift 2 ;;