Build JNI binaries against PDAL 2.1.0 (#44)

Author: pomadchin

.github/workflows/actions.yml

@@ -9,10 +9,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.1, 2.12.10]
+        scala: [2.13.2, 2.12.10]
 
     container:
-      image: daunnc/pdal-debian:2.0.1
+      image: daunnc/pdal-debian:2.1.0
 
     steps:
       - name: Checkout
@@ -50,7 +50,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        scala: [2.13.1, 2.12.10]
+        scala: [2.13.2, 2.12.10]
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -6,8 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.5] - 2020-05-16
 ### Changed
 - Update filter.stats [#39](https://github.com/PDAL/java/pull/39)
+- Build JNI binaries against PDAL 2.1.0 [#43](https://github.com/PDAL/java/issues/43)
 
 ## [2.1.5-RC3] - 2020-03-13
 ### Fixed 
@@ -104,7 +106,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Moved from the PDAL repo and established own lifecycle.
 
-[Unreleased]: https://github.com/PDAL/java/compare/2.1.5-RC3...HEAD
+[Unreleased]: https://github.com/PDAL/java/compare/2.1.5...HEAD
+[2.1.5]: https://github.com/PDAL/java/compare/2.1.5-RC3...2.1.5
 [2.1.5-RC3]: https://github.com/PDAL/java/compare/2.1.5-RC2...2.1.5-RC3
 [2.1.5-RC2]: https://github.com/PDAL/java/compare/2.1.5-RC1...2.1.5-RC2
 [2.1.5-RC1]: https://github.com/PDAL/java/compare/2.1.4...2.1.5-RC1

build.sbt

@@ -2,12 +2,12 @@ name := "pdal-jni"
 
 lazy val commonSettings = Seq(
   version := "2.1.5" + Environment.versionSuffix,
-  scalaVersion := "2.13.1",
-  crossScalaVersions := Seq("2.13.1", "2.12.10", "2.11.12"),
+  scalaVersion := "2.13.2",
+  crossScalaVersions := Seq("2.13.2", "2.12.10", "2.11.12"),
   organization := "io.pdal",
   description := "PDAL JNI bindings",
   licenses := Seq("BSD" -> url("https://github.com/PDAL/PDAL/blob/master/LICENSE.txt")),
-  homepage := Some(url("http://www.pdal.io")),
+  homepage := Some(url("https://www.pdal.io")),
   publishMavenStyle := true,
   pomIncludeRepository := { _ => false },
   scalacOptions ++= Seq(
@@ -43,7 +43,7 @@ lazy val commonSettings = Seq(
         <developer>
           <id>pomadchin</id>
           <name>Grigory Pomadchin</name>
-          <url>http://github.com/pomadchin/</url>
+          <url>https://github.com/pomadchin/</url>
         </developer>
       </developers>
     ),

examples/pdal-jni/build.sbt

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

examples/pdal-jni/sbt

@@ -6,10 +6,10 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.3.6"
-declare -r sbt_unreleased_version="1.3.6"
+declare -r sbt_release_version="1.3.10"
+declare -r sbt_unreleased_version="1.3.10"
 
-declare -r latest_213="2.13.1"
+declare -r latest_213="2.13.2"
 declare -r latest_212="2.12.10"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
@@ -24,7 +24,7 @@ declare -r sbt_launch_mvn_release_repo="https://repo.scala-sbt.org/scalasbt/mave
 declare -r sbt_launch_mvn_snapshot_repo="https://repo.scala-sbt.org/scalasbt/maven-snapshots"
 
 declare -r default_jvm_opts_common="-Xms512m -Xss2m -XX:MaxInlineLevel=18"
-declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
+declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy -Dsbt.coursier.home=project/.coursier"
 
 declare sbt_jar sbt_dir sbt_create sbt_version sbt_script sbt_new
 declare sbt_explicit_version
@@ -230,14 +230,6 @@ default_jvm_opts() {
   fi
 }
 
-build_props_scala() {
-  if [[ -r "$buildProps" ]]; then
-    versionLine="$(grep '^build.scala.versions' "$buildProps")"
-    versionString="${versionLine##build.scala.versions=}"
-    echo "${versionString%% .*}"
-  fi
-}
-
 execRunner() {
   # print the arguments one to a line, quoting any containing spaces
   vlog "# Executing command line:" && {

sbt

@@ -6,10 +6,10 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.3.8"
-declare -r sbt_unreleased_version="1.3.8"
+declare -r sbt_release_version="1.3.10"
+declare -r sbt_unreleased_version="1.3.10"
 
-declare -r latest_213="2.13.1"
+declare -r latest_213="2.13.2"
 declare -r latest_212="2.12.10"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
@@ -24,7 +24,7 @@ declare -r sbt_launch_mvn_release_repo="https://repo.scala-sbt.org/scalasbt/mave
 declare -r sbt_launch_mvn_snapshot_repo="https://repo.scala-sbt.org/scalasbt/maven-snapshots"
 
 declare -r default_jvm_opts_common="-Xms512m -Xss2m -XX:MaxInlineLevel=18"
-declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
+declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy -Dsbt.coursier.home=project/.coursier"
 
 declare sbt_jar sbt_dir sbt_create sbt_version sbt_script sbt_new
 declare sbt_explicit_version
@@ -230,14 +230,6 @@ default_jvm_opts() {
   fi
 }
 
-build_props_scala() {
-  if [[ -r "$buildProps" ]]; then
-    versionLine="$(grep '^build.scala.versions' "$buildProps")"
-    versionString="${versionLine##build.scala.versions=}"
-    echo "${versionString%% .*}"
-  fi
-}
-
 execRunner() {
   # print the arguments one to a line, quoting any containing spaces
   vlog "# Executing command line:" && {

scripts/crosscompile.sh

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

scripts/publish-211.sh

@@ -28,5 +28,6 @@ if ${SIGNED}; then
     COMMAND=publishSigned
 fi
 
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" "project core" ${COMMAND}
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" "project core-scala" ${COMMAND}
+PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" \
+  "project core" ${COMMAND} \
+  "project core-scala" ${COMMAND}

scripts/publish-212.sh

@@ -28,5 +28,6 @@ if ${SIGNED}; then
     COMMAND=publishSigned
 fi
 
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core" ${COMMAND}
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" "project core-scala" ${COMMAND}
+PDAL_DEPEND_ON_NATIVE=false ./sbt "-212" \
+  "project core" ${COMMAND} \
+  "project core-scala" ${COMMAND}

scripts/publish-local-211.sh

@@ -16,6 +16,8 @@ done
 
 export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}
 
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" "project core" publishLocal
-PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" "project core-scala" publishLocal
+PDAL_DEPEND_ON_NATIVE=false ./sbt "-211" \
+  "project core" publishLocal \
+  "project core-scala" publishLocal
+
 ./sbt "-211" "project native" publishLocal