Plugins update & minor improvements

.gitignore

@@ -57,3 +57,5 @@ java/data
 java/*.dylib
 java/*.so
 java/*dll
+
+*.log

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.7.17
+version = 3.7.17
 runner.dialect = scala3
 align.openParenCallSite = true
 align.openParenDefnSite = true

native/src/JavaPipeline.cpp

@@ -36,6 +36,7 @@
 #include <pdal/XMLSchema.hpp>
 #endif
 
+using pdal::LogLevel;
 using pdal::LogPtr;
 using pdal::MetadataNode;
 using pdal::PointId;
@@ -227,8 +228,8 @@ void PipelineExecutor::setLogStream(std::ostream& strm)
 
 void PipelineExecutor::setLogLevel(int level)
 {
-    if (level < 0 || level > 8)
-        throw java_error("log level must be between 0 and 8!");
+    if (level < static_cast<int>(LogLevel::Error) || level > static_cast<int>(LogLevel::None))
+        throw java_error("log level must be between 0 and 9!");
 
     m_logLevel = static_cast<pdal::LogLevel>(level);
     setLogStream(m_logStream);

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("com.github.sbt" % "sbt-jni" % "1.6.0")
+addSbtPlugin("com.github.sbt" % "sbt-jni" % "1.7.0")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

scripts/README.md

@@ -0,0 +1,6 @@
+# PDAL Java publish scripts
+
+This is a set of not well maintained scripts that were used to publish PDAL from a Mac laptop. 
+Crosscompilation idea in this case is to build linux binaries in a docker conatiner, mac binaries locally, pack all the outputs into the jar.
+
+Similar result is achieved via CI at this point.

scripts/crosscompile-linux.sh

@@ -6,4 +6,4 @@ docker run -it --rm \
   -v $HOME/.ivy2:/root/.ivy2 \
   -v $HOME/.sbt:/root/.sbt \
   -v $HOME/.coursier/cache:/root/.cache/coursier \
- daunnc/pdal-ubuntu:2.6.0 bash -c "cd ./pdal-java; ./sbt native/compile"
+ daunnc/pdal-ubuntu:2.6.0 bash -c "cd ./pdal-java; sbt native/compile"

scripts/docker/2.6.0/ubuntu/Dockerfile

@@ -10,7 +10,15 @@ RUN set -ex && \
 ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd6
 RUN update-alternatives --set java `update-alternatives --list java | grep java-8`
 
-RUN apt-get -y install bash gcc g++ cmake wget unzip gpg software-properties-common
+RUN apt-get update && apt-get -y install bash gcc g++ cmake wget unzip gpg software-properties-common
+
+# Install SBT
+RUN apt-get install -y curl gnupg && \
+ echo 'deb https://repo.scala-sbt.org/scalasbt/debian all main' | tee /etc/apt/sources.list.d/sbt.list && \
+ echo 'deb https://repo.scala-sbt.org/scalasbt/debian /' | tee /etc/apt/sources.list.d/sbt_old.list && \
+ curl -sL 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823' | apt-key add - && \
+ apt-get update && \
+ apt-get install -y sbt
 
 RUN ln -s /opt/conda/envs/pdal/include/pdal /usr/include/pdal && \
     ln -s /usr/include /usr/lib/include && \

scripts/publish-local-native.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 ./scripts/crosscompile-linux.sh && \
-./sbt native/publishLocal
+sbt native/publishLocal

scripts/publish-local.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-PDAL_DEPEND_ON_NATIVE=false ./sbt ";+core/publishLocal;+core-scala/publishLocal"
+PDAL_DEPEND_ON_NATIVE=false sbt ";+core/publishLocal;+core-scala/publishLocal"

scripts/publish-native.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 ./scripts/crosscompile-linux.sh && \
-./sbt native/publishSigned
+sbt native/publishSigned

scripts/publish.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-PDAL_DEPEND_ON_NATIVE=false ./sbt ";+core;publishSigned;+core-scala/publishSigned"
+PDAL_DEPEND_ON_NATIVE=false sbt ";+core;publishSigned;+core-scala/publishSigned"