Update dependencies

Author: pomadchin

.gitignore

@@ -1,6 +1,6 @@
 # Operating System Files
 
-# *.DS_Store
+*.DS_Store
 Thumbs.db
 
 # Build Files

.travis.yml

@@ -8,17 +8,17 @@ matrix:
       scala:
         - 2.11.12
       before_install:
-        - docker pull daunnc/pdal-debian:1.7.1
+        - docker pull daunnc/pdal-debian:1.8.0
       services:
         - docker
 
     - os: linux
       jdk: oraclejdk8
       language: scala
       scala:
-        - 2.12.6
+        - 2.12.8
       before_install:
-        - docker pull daunnc/pdal-debian:1.7.1
+        - docker pull daunnc/pdal-debian:1.8.0
       services:
         - docker
 
@@ -34,7 +34,7 @@ matrix:
 
     - os: osx
       scala:
-        - 2.12.5
+        - 2.12.8
       compiler:
         - gcc
         - clang

.travis/run.sh

@@ -9,5 +9,5 @@ else
                -v $TRAVIS_BUILD_DIR:/pdal-java \
                -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION \
                -e TRAVIS_COMMIT=$TRAVIS_COMMIT \
-               -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
+               -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal-debian:1.8.0 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
 fi

build.sbt

@@ -3,7 +3,7 @@ name := "pdal-jni"
 lazy val commonSettings = Seq(
   version := "1.7.0" + Environment.versionSuffix,
   scalaVersion := "2.11.12",
-  crossScalaVersions := Seq("2.12.6", "2.11.12"),
+  crossScalaVersions := Seq("2.12.8", "2.11.12"),
   organization := "io.pdal",
   description := "PDAL JNI bindings",
   licenses := Seq("BSD" -> url("https://github.com/PDAL/PDAL/blob/master/LICENSE.txt")),

examples/pdal-jni/build.sbt

@@ -1,7 +1,7 @@
 name := "pdal-jni"
 version := "0.1.0-SNAPSHOT"
-scalaVersion := "2.12.5"
-crossScalaVersions := Seq("2.12.5", "2.11.12")
+scalaVersion := "2.12.8"
+crossScalaVersions := Seq("2.12.8", "2.11.12")
 organization := "com.azavea"
 scalacOptions ++= Seq(
   "-deprecation",
@@ -21,7 +21,7 @@ resolvers ++= Seq(
 
 fork := true
 
-val pdalVersion = "1.7.0-RC3"
+val pdalVersion = "1.7.0-RC4"
 
 libraryDependencies ++= Seq(
   "io.pdal" %% "pdal"        % pdalVersion,

project/Version.scala

@@ -1,5 +1,5 @@
 object Version {
-  val circe     = "0.9.3"
+  val circe     = "0.11.0"
   val scalaTest = "3.0.5"
   val jtsCore   = "1.14.0"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.4
+sbt.version=1.2.8

sbt

@@ -6,11 +6,11 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="0.13.16"
-declare -r sbt_unreleased_version="0.13.16"
+declare -r sbt_release_version="0.13.18"
+declare -r sbt_unreleased_version="0.13.18"
 
-declare -r latest_213="2.13.0-M2"
-declare -r latest_212="2.12.4"
+declare -r latest_213="2.13.0-M5"
+declare -r latest_212="2.12.8"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"
@@ -23,7 +23,7 @@ declare -r sbt_launch_ivy_snapshot_repo="https://repo.scala-sbt.org/scalasbt/ivy
 declare -r sbt_launch_mvn_release_repo="http://repo.scala-sbt.org/scalasbt/maven-releases"
 declare -r sbt_launch_mvn_snapshot_repo="http://repo.scala-sbt.org/scalasbt/maven-snapshots"
 
-declare -r default_jvm_opts_common="-Xms512m -Xmx1536m -Xss2m"
+declare -r default_jvm_opts_common="-Xms512m -Xss2m"
 declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
 
 declare sbt_jar sbt_dir sbt_create sbt_version sbt_script sbt_new
@@ -98,21 +98,6 @@ build_props_sbt () {
     grep '^sbt\.version' "$buildProps" | tr '=\r' ' ' | awk '{ print $2; }'
 }
 
-update_build_props_sbt () {
-  local ver="$1"
-  local old="$(build_props_sbt)"
-
-  [[ -r "$buildProps" ]] && [[ "$ver" != "$old" ]] && {
-    perl -pi -e "s/^sbt\.version\b.*\$/sbt.version=${ver}/" "$buildProps"
-    grep -q '^sbt.version[ =]' "$buildProps" || printf "\nsbt.version=%s\n" "$ver" >> "$buildProps"
-
-    vlog "!!!"
-    vlog "!!! Updated file $buildProps setting sbt.version to: $ver"
-    vlog "!!! Previous value was: $old"
-    vlog "!!!"
-  }
-}
-
 set_sbt_version () {
   sbt_version="${sbt_explicit_version:-$(build_props_sbt)}"
   [[ -n "$sbt_version" ]] || sbt_version=$sbt_release_version
@@ -173,7 +158,19 @@ setJavaHome () {
   export PATH="$JAVA_HOME/bin:$PATH"
 }
 
-getJavaVersion() { "$1" -version 2>&1 | grep -E -e '(java|openjdk) version' | awk '{ print $3 }' | tr -d \"; }
+getJavaVersion() {
+  local str=$("$1" -version 2>&1 | grep -E -e '(java|openjdk) version' | awk '{ print $3 }' | tr -d '"')
+
+  # java -version on java8 says 1.8.x
+  # but on 9 and 10 it's 9.x.y and 10.x.y.
+  if [[ "$str" =~ ^1\.([0-9]+)\..*$ ]]; then
+    echo "${BASH_REMATCH[1]}"
+  elif [[ "$str" =~ ^([0-9]+)\..*$ ]]; then
+    echo "${BASH_REMATCH[1]}"
+  elif [[ -n "$str" ]]; then
+    echoerr "Can't parse java version from: $str"
+  fi
+}
 
 checkJava() {
   # Warn if there is a Java version mismatch between PATH and JAVA_HOME/JDK_HOME
@@ -196,7 +193,7 @@ checkJava() {
 java_version () {
   local version=$(getJavaVersion "$java_cmd")
   vlog "Detected Java version: $version"
-  echo "${version:2:1}"
+  echo "$version"
 }
 
 # MaxPermSize critical on pre-8 JVMs but incurs noisy warning on 8+
@@ -462,8 +459,7 @@ setTraceLevel() {
 # set scalacOptions if we were given any -S opts
 [[ ${#scalac_args[@]} -eq 0 ]] || addSbt "set scalacOptions in ThisBuild += \"${scalac_args[@]}\""
 
-# Update build.properties on disk to set explicit version - sbt gives us no choice
-[[ -n "$sbt_explicit_version" && -z "$sbt_new" ]] && update_build_props_sbt "$sbt_explicit_version"
+[[ -n "$sbt_explicit_version" && -z "$sbt_new" ]] && addJava "-Dsbt.version=$sbt_explicit_version"
 vlog "Detected sbt version $sbt_version"
 
 if [[ -n "$sbt_script" ]]; then

scripts/crosscompile.sh

@@ -21,7 +21,7 @@ docker run -it --rm \
   -v $PWD:/pdal-java \
   -v $HOME/.ivy2:/root/.ivy2 \
   -v $HOME/.sbt:/root/.sbt \
- daunnc/pdal-debian:1.7.1 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
+ daunnc/pdal-debian:1.8.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
 
 # docker run -it --rm \
 #   -v $PWD:/workdir \