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
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
scala: [2.13.2, 2.12.10]

container:
image: daunnc/pdal-debian:2.1.0
image: daunnc/pdal-ubuntu:2.1.0

steps:
- name: Checkout
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.1.6] - 2020-05-16
### Changed
- Make prebuilt JNI binaries conda compatible [#42](https://github.com/PDAL/java/issues/42)

## [2.1.5] - 2020-05-16
### Changed
- Update filter.stats [#39](https://github.com/PDAL/java/pull/39)
Expand Down Expand Up @@ -106,7 +110,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...HEAD
[Unreleased]: https://github.com/PDAL/java/compare/2.1.6...HEAD
[2.1.6]: https://github.com/PDAL/java/compare/2.1.5...2.1.6
[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
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 @@ -21,7 +21,7 @@ resolvers ++= Seq(

fork := true

val pdalVersion = "2.1.5"
val pdalVersion = "2.1.6"

libraryDependencies ++= Seq(
"io.pdal" %% "pdal" % pdalVersion,
Expand Down
2 changes: 1 addition & 1 deletion examples/pdal-jni/project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.2.8
sbt.version=1.3.10

2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.8
sbt.version=1.3.10
2 changes: 1 addition & 1 deletion scripts/crosscompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"
daunnc/pdal-ubuntu:2.1.0 bash -c "cd ./pdal-java; ./scripts/pack-native.sh --suffix=${PDAL_VERSION_SUFFIX}"

# docker run -it --rm \
# -v $PWD:/workdir \
Expand Down
13 changes: 13 additions & 0 deletions scripts/docker/2.1.0/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM pdal/pdal:2.1
MAINTAINER Grigory Pomadchin <daunnc@gmail.com>

RUN set -ex && \
apt update -y && \
apt install \
openjdk-8-jdk \
ca-certificates-java -y

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