Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ jobs:
arch: arm64
java: [11]
distribution: [temurin]
pdal: [2.8.1]
pdal: [2.9.3]
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -el {0}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: coursier/cache-action@v6
- uses: actions/setup-java@v4
- uses: coursier/cache-action@v8
- uses: actions/setup-java@v6
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}

- name: Install sbt
uses: sbt/setup-sbt@v1

- uses: conda-incubator/setup-miniconda@v3
- uses: conda-incubator/setup-miniconda@v4
with:
activate-environment: pdal-java
channels: conda-forge
Expand All @@ -54,7 +54,7 @@ jobs:

- name: Cache Conda env
id: conda-cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ${{ steps.cache-config.outputs.path }}
key:
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Build project
run: sbt +test

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
if: ${{ startsWith(matrix.os, 'macos') }}
with:
name: ${{ matrix.os }}
Expand All @@ -88,7 +88,7 @@ jobs:
os: [ubuntu-latest]
java: [11]
distribution: [temurin]
pdal: [2.8.4]
pdal: [2.9.3]
runs-on: ${{ matrix.os }}
if: github.event_name != 'pull_request'
needs: [build]
Expand All @@ -100,19 +100,19 @@ jobs:
CI_CLEAN: ""

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: coursier/cache-action@v6
- uses: actions/setup-java@v4
- uses: coursier/cache-action@v8
- uses: actions/setup-java@v6
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}

- name: Install sbt
uses: sbt/setup-sbt@v1

- uses: conda-incubator/setup-miniconda@v3
- uses: conda-incubator/setup-miniconda@v4
with:
activate-environment: pdal-java
channels: conda-forge
Expand All @@ -126,7 +126,7 @@ jobs:

- name: Cache Conda env
id: conda-cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ${{ steps.cache-config.outputs.path }}
key:
Expand All @@ -142,7 +142,7 @@ jobs:
if: ${{ matrix.os == 'ubuntu-latest' }}
run: echo "LD_LIBRARY_PATH=$CONDA/envs/pdal-java/lib:/usr/local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: macos-latest
path: native/target/native/arm64-darwin/bin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
update_release_draft:
runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v6.0.0
- uses: release-drafter/release-drafter@v7.7.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## Added
- PDAL 2.9.x [#116](https://github.com/pdal/java/pull/116) (@pomadchin)

## Changed
- Bump PDAL JNI lib version up to 2.9 [#116](https://github.com/pdal/java/pull/116) (@pomadchin)
- Build the native bindings with C++17, required by `pdal/FileSpec.hpp` [#116](https://github.com/pdal/java/pull/116) (@pomadchin)
- Update GitHub Actions used by CI [#116](https://github.com/pdal/java/pull/116) (@pomadchin)

## [2.8.0] - 2024-09-10
## Added
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Dependency contains bindings for `arm64-darwin`, and `x86_64-linux`, other versi

Given a `{major}.{minor}.{patch}` version:
* `{major}.{minor}` - matches the **PDAL** version it is published for
* e.g. **pdal-java** of version `2.6.1` is suitable for all **PDAL** versions `2.6.x` (`2.6.0`, ..., `2.6.3`, etc) major = `2`, minor = `6`
* e.g. **pdal-java** of version `2.9.0` is suitable for all **PDAL** versions `2.9.x` (`2.9.0`, ..., `2.9.3`, etc) major = `2`, minor = `9`
* `{patch}` - this portion of the version corresponds to updates within **pdal-java** and should remain compatible with **PDAL library** `{major}.{minor}` versions
* This implies that there may be multiple **pdal-java** releases for the same **PDAL library** version. All releases are compatible with the matching **PDAL library** `{major}.{minor}` version. Thus, higher patch versions are to be preferred.

Expand All @@ -43,7 +43,7 @@ If you would like to use your own bindings, it is necessary to set `java.library

```scala
// macOS X example with manual JNI installation
// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.8.dylib /usr/local/lib/libpdaljni.2.8.dylib
// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.9.dylib /usr/local/lib/libpdaljni.2.9.dylib
// place built binary into /usr/local/lib, and pass java.library.path to your JVM
javaOptions += "-Djava.library.path=/usr/local/lib"
```
Expand Down Expand Up @@ -239,7 +239,7 @@ PDAL_DEPEND_ON_NATIVE=false sbt -Djava.library.path=<path>

#### - In case of not installed as global PDAL change [this](./java/native/src/CMakeLists.txt#L25) line to:
```cmake
set(CMAKE_CXX_FLAGS "$ENV{PDAL_LD_FLAGS} $ENV{PDAL_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS "$ENV{PDAL_LD_FLAGS} $ENV{PDAL_CXX_FLAGS} -std=c++17")
```
In this case sbt launch would be the following:
```bash
Expand All @@ -251,7 +251,7 @@ PDAL_LD_FLAGS=`pdal-config --libs` PDAL_CXX_FLAGS=`pdal-config --includes` sbt
the quick workaround would be to replace [this](./java/native/src/CMakeLists.txt#L25) line to:

```cmake
set(CMAKE_CXX_FLAGS "-L<path to dynamic libs> -std=c++11")
set(CMAKE_CXX_FLAGS "-L<path to dynamic libs> -std=c++17")
```

#### - On macOS could be difficult to install PDAL sometimes (near new releases). You have three options
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/io/pdal/Pipeline.scala
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Pipeline private (val json: String, val logLevel: Int) extends Native {
def getLogLevel(): LogLevel.Value = LogLevel.apply(getLogLevelInt())
}

object Pipeline extends NativeLoader("pdaljni.2.8") {
object Pipeline extends NativeLoader("pdaljni.2.9") {
def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline =
new Pipeline(json, logLevel)
}
Loading
Loading