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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
arch: arm64
java: [11]
distribution: [temurin]
pdal: [2.9.3]
pdal: [2.10.2]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
os: [ubuntu-latest]
java: [11]
distribution: [temurin]
pdal: [2.9.3]
pdal: [2.10.2]
runs-on: ${{ matrix.os }}
if: github.event_name != 'pull_request'
needs: [build]
Expand Down
4 changes: 2 additions & 2 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.9.0` is suitable for all **PDAL** versions `2.9.x` (`2.9.0`, ..., `2.9.3`, etc) major = `2`, minor = `9`
* e.g. **pdal-java** of version `2.10.0` is suitable for all **PDAL** versions `2.10.x` (`2.10.0`, ..., `2.10.2`, etc) major = `2`, minor = `10`
* `{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.9.dylib /usr/local/lib/libpdaljni.2.9.dylib
// cp -f native/target/resource_managed/main/native/arm64-darwin/libpdaljni.2.10.dylib /usr/local/lib/libpdaljni.2.10.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
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.9") {
object Pipeline extends NativeLoader("pdaljni.2.10") {
def apply(json: String, logLevel: LogLevel.Value = LogLevel.Error): Pipeline =
new Pipeline(json, logLevel)
}
6 changes: 3 additions & 3 deletions core/src/test/resources/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
}
},
"conversion": {
"name": "unnamed",
"name": "unknown",
"method": {
"name": "Lambert Conic Conformal (2SP)",
"id": {
Expand Down Expand Up @@ -144,13 +144,13 @@
"axis": [
{
"name": "Easting",
"abbreviation": "",
"abbreviation": "E",
"direction": "east",
"unit": "metre"
},
{
"name": "Northing",
"abbreviation": "",
"abbreviation": "N",
"direction": "north",
"unit": "metre"
}
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/resources/quick-info-with-metadata-mac.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}
},
"conversion": {
"name": "unnamed",
"name": "unknown",
"method": {
"name": "Lambert Conic Conformal (2SP)",
"id": {
Expand Down Expand Up @@ -123,13 +123,13 @@
"axis": [
{
"name": "Easting",
"abbreviation": "",
"abbreviation": "E",
"direction": "east",
"unit": "metre"
},
{
"name": "Northing",
"abbreviation": "",
"abbreviation": "N",
"direction": "north",
"unit": "metre"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/pdal-jni/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ resolvers += Resolver.sonatypeCentralSnapshots

fork := true

val pdalVersion = "2.9.0"
val pdalVersion = "2.10.0"

libraryDependencies ++= Seq(
"io.pdal" %% "pdal" % pdalVersion,
Expand Down
2 changes: 1 addition & 1 deletion native/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(MAKE_COLOR_MAKEFILE ON)

project (pdaljni)
set(PROJECT_VERSION_MAJOR 2)
set(PROJECT_VERSION_MINOR 9)
set(PROJECT_VERSION_MINOR 10)
set(PROJECT_VERSION_PATCH 0)

set(PDAL_LIB_NAME pdalcpp)
Expand Down
Loading