[WIP] PDAL 2.3.0 (#57)

* Upd dependencies and CI

* Modify Docker images

* Add snapshots release

* Adjust the release process

Author: pomadchin

.github/workflows/actions.yml

@@ -0,0 +1,97 @@
+name: CI
+
+on:
+  pull_request:
+    branches: ['**']
+  push:
+    branches: ['master']
+    tags: [v*]
+  release:
+    types: [published]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    container:
+      image: daunnc/pdal-ubuntu:2.3.0
+    
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: coursier/cache-action@v6
+      - uses: olafurpg/setup-scala@v11
+        with:
+          java-version: [email protected]
+
+      - name: Check formatting
+        run: sbt scalafmtCheckAll
+
+      - name: Build project
+        run: sbt +test
+
+  macos:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: coursier/cache-action@v6
+      - uses: olafurpg/setup-scala@v11
+        with:
+          java-version: [email protected]
+
+      - name: Cache Homebrew
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/Homebrew
+          key: ${{ runner.os }}-homebrew
+
+      - name: Install PDAL
+        run: |
+          brew update && \
+          brew install pdal || true
+
+      - name: Check formatting
+        run: sbt scalafmtCheckAll
+
+      - name: Build project
+        run: sbt +test
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: macos
+          path: native/target/native/x86_64-darwin/bin
+
+  publish:
+    runs-on: ubuntu-latest
+    needs: [linux, macos]
+    container:
+      image: daunnc/pdal-ubuntu:2.3.0
+    if: github.event_name != 'pull_request'
+    env: 
+      PDAL_DEPEND_ON_NATIVE: "false"
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: coursier/cache-action@v6
+      - uses: olafurpg/setup-scala@v11
+        with:
+          java-version: [email protected]
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: macos
+          path: native/target/native/x86_64-darwin/bin
+
+      - name: Release
+        run: sbt ci-release
+        env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        if: ${{ env.SONATYPE_PASSWORD != '' && env.SONATYPE_USERNAME != '' }}

.github/workflows/ci.yml

@@ -0,0 +1,13 @@
+version=3.0.0-RC6
+runner.dialect = scala3
+align.openParenCallSite = true
+align.openParenDefnSite = true
+maxColumn = 120
+continuationIndent.defnSite = 2
+assumeStandardLibraryStripMargin = true
+danglingParentheses.preset = true
+rewrite.rules = [AvoidInfix, SortImports, RedundantParens, SortModifiers]
+docstrings = JavaDoc
+newlines.afterCurlyLambda = preserve
+docstrings.style = Asterisk
+docstrings.oneline = unfold

.scalafmt.conf

@@ -1,6 +1,6 @@
 # PDAL Java bindings
 
-[![PDAL Java CI](https://github.com/PDAL/java/workflows/PDAL%20Java%20CI/badge.svg)](https://github.com/PDAL/java/actions) [![Join the chat at https://gitter.im/PDAL/PDAL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PDAL/PDAL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.pdal/pdal/badge.svg)](https://search.maven.org/search?q=g:io.pdal)
+[![CI](https://github.com/PDAL/java/workflows/CI/badge.svg)](https://github.com/PDAL/java/actions) [![Join the chat at https://gitter.im/PDAL/PDAL](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PDAL/PDAL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Maven Central](https://img.shields.io/maven-central/v/io.pdal/pdal_2.13)](https://search.maven.org/search?q=g:io.pdal) [![Snapshots](https://img.shields.io/nexus/s/https/oss.sonatype.org/io.pdal/pdal_2.13)](https://oss.sonatype.org/content/repositories/snapshots/io/pdal/)
 
 Java bindings to use PDAL on JVM (supports PDAL >= 2.0).
 Mac users can experience some issues with bindings that were build against a different PDAL version,

README.md

@@ -1,13 +1,15 @@
 name := "pdal-jni"
 
+val scalaVersions = Seq("3.0.1", "2.13.6", "2.12.14")
+
 lazy val commonSettings = Seq(
-  version := "2.2.1" + Environment.versionSuffix,
-  scalaVersion := "2.13.6",
-  crossScalaVersions := Seq("2.13.6", "2.12.14", "2.11.12"),
+  scalaVersion := scalaVersions.head,
+  crossScalaVersions := scalaVersions,
   organization := "io.pdal",
   description := "PDAL JNI bindings",
   licenses := Seq("BSD" -> url("https://github.com/PDAL/PDAL/blob/master/LICENSE.txt")),
   homepage := Some(url("https://www.pdal.io")),
+  versionScheme := Some("semver-spec"),
   publishMavenStyle := true,
   pomIncludeRepository := { _ => false },
   scalacOptions ++= Seq(
@@ -20,62 +22,53 @@ lazy val commonSettings = Seq(
     "-language:existentials",
     "-feature"
   ),
-  assembly / test := {},
   shellPrompt := { s => Project.extract(s).currentProject.id + " > " },
-  commands ++= Seq(
-    Commands.processJavastyleCommand("publish"),
-    Commands.processJavastyleCommand("publishSigned")
-  ),
   Test / publishArtifact := false,
-  publishTo := {
-    val nexus = "https://oss.sonatype.org/"
-    if (isSnapshot.value)
-      Some("snapshots" at nexus + "content/repositories/snapshots")
-    else
-      Some("releases"  at nexus + "service/local/staging/deploy/maven2")
-  },
-  pomExtra := (
-    <scm>
-      <url>git@github.com:PDAL/PDAL.git</url>
-      <connection>scm:git:git@github.com:PDAL/PDAL.git</connection>
-    </scm>
-      <developers>
-        <developer>
-          <id>pomadchin</id>
-          <name>Grigory Pomadchin</name>
-          <url>https://github.com/pomadchin/</url>
-        </developer>
-      </developers>
-    ),
-  Global / PgpKeys.useGpg := true,
-  Global / PgpKeys.gpgCommand := "gpg"
+  developers := List(
+    Developer(
+      "pomadchin",
+      "Grigory Pomadchin",
+      "@pomadchin",
+      url("https://github.com/pomadchin")
+    )
+  )
 )
 
 lazy val root = (project in file("."))
   .settings(commonSettings: _*)
+  .settings(
+    scalaVersion := scalaVersions.head,
+    crossScalaVersions := Nil,
+    publish := {},
+    publishLocal := {}
+  )
   .aggregate(`core-scala`, core, native)
 
 lazy val `core-scala` = project
   .settings(commonSettings: _*)
   .settings(Dependencies.macroSettings)
   .settings(Dependencies.licenseSettings)
+  .settings(scalaVersion := "2.13.6", crossScalaVersions := Seq("2.13.6", "2.12.14"))
   .settings(name := "pdal-scala")
   .settings(javah / target := (native / nativeCompile / sourceDirectory).value / "include")
-  .settings(libraryDependencies ++= Seq(
-    Dependencies.circe("core").value,
-    Dependencies.circe("generic").value,
-    Dependencies.circe("generic-extras").value,
-    Dependencies.circe("parser").value,
-    Dependencies.jtsCore,
-    Dependencies.scalaTest % Test
-  ))
+  .settings(
+    libraryDependencies ++= Seq(
+      Dependencies.circe("core"),
+      Dependencies.circe("generic"),
+      Dependencies.circe("generic-extras"),
+      Dependencies.circe("parser"),
+      Dependencies.jtsCore,
+      Dependencies.scalaTest % Test
+    )
+  )
   .dependsOn(core)
   .dependsOn(Environment.dependOnNative(native % Runtime): _*)
 
 lazy val core = project
   .settings(commonSettings: _*)
   .settings(name := "pdal")
   .settings(javah / target := (native / nativeCompile / sourceDirectory).value / "include")
+  .settings(sbtJniCoreScope := Compile)
   .settings(libraryDependencies += Dependencies.scalaTest % Test)
   .dependsOn(Environment.dependOnNative(native % Runtime): _*)
 
@@ -84,6 +77,12 @@ lazy val native = project
   .settings(crossPaths := false)
   .settings(name := "pdal-native")
   .settings(nativeCompile / sourceDirectory := sourceDirectory.value)
+  .settings(
+    Compile / unmanagedPlatformDependentNativeDirectories := Seq(
+      "x86_64-linux" -> target.value / "native/x86_64-linux/bin/",
+      "x86_64-darwin" -> target.value / "native/x86_64-darwin/bin/"
+    )
+  )
   .settings(artifactName := { (sv: ScalaVersion, module: ModuleID, artifact: Artifact) =>
     artifact.name + "-" + nativePlatform.value + "-" + module.revision + "." + artifact.extension
   })

build.sbt

@@ -37,7 +37,11 @@ object ExprType {
 
   def fromName(name: String): ExprType =
     Try(FilterTypes.fromName(name))
-      .getOrElse(Try(ReaderTypes.fromName(name))
-        .getOrElse(Try(WriterTypes.fromName(name))
-          .getOrElse(throw new Exception(s"ExprType $name is not supported."))))
+      .getOrElse(
+        Try(ReaderTypes.fromName(name))
+          .getOrElse(
+            Try(WriterTypes.fromName(name))
+              .getOrElse(throw new Exception(s"ExprType $name is not supported."))
+          )
+      )
 }