Skip to content

Fix Scala DSL hierarchy #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2020
Merged

Fix Scala DSL hierarchy #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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.3] - 2020-03-03
### Fixed
- Fix Scala DSL hierarchy [#31](https://github.com/PDAL/java/issues/31)

## [2.1.2] - 2020-03-02
### Added
- Expose PDAL Mesh API [#27](https://github.com/PDAL/java/pull/27)
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ resolvers ++= Seq(
)

libraryDependencies ++= Seq(
"io.pdal" %% "pdal" % "2.1.2", // core library
"io.pdal" % "pdal-native" % "2.1.2" // jni bindings
"io.pdal" %% "pdal" % "2.1.3", // core library
"io.pdal" % "pdal-native" % "2.1.3" // jni bindings
)
```

Expand All @@ -41,8 +41,8 @@ Scala API allows to build pipeline expressions instead of writing a raw JSON.

```scala
libraryDependencies ++= Seq(
"io.pdal" %% "pdal-scala" % "2.1.2", // scala core library
"io.pdal" % "pdal-native" % "2.1.2" // jni bindings
"io.pdal" %% "pdal-scala" % "2.1.3", // scala core library
"io.pdal" % "pdal-native" % "2.1.3" // jni bindings
)
```

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name := "pdal-jni"

lazy val commonSettings = Seq(
version := "2.1.2" + Environment.versionSuffix,
version := "2.1.3" + Environment.versionSuffix,
scalaVersion := "2.13.1",
crossScalaVersions := Seq("2.13.1", "2.12.10", "2.11.12"),
organization := "io.pdal",
Expand Down
14 changes: 7 additions & 7 deletions core-scala/src/main/scala/io/pdal/pipeline/PipelineExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ case class ReadBpf(
overrideSrs: Option[String] = None,
tag: Option[String] = None,
`type`: ReaderType = ReaderTypes.bpf
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class ReadEpt(
Expand All @@ -77,7 +77,7 @@ case class ReadEpt(
threads: Option[Int] = None,
tag: Option[String] = None,
`type`: ReaderType = ReaderTypes.ept
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class ReadE57(
Expand All @@ -86,7 +86,7 @@ case class ReadE57(
overrideSrs: Option[String] = None,
tag: Option[String] = None,
`type`: ReaderType = ReaderTypes.e57
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class ReadFaux(
Expand Down Expand Up @@ -137,7 +137,7 @@ case class ReadI3s(
threads: Option[Int] = None,
tag: Option[String] = None,
`type`: ReaderType = ReaderTypes.i3s
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class ReadIlvis2(
Expand Down Expand Up @@ -193,7 +193,7 @@ case class ReadNumpy(
z: Option[Int] = None,
assignZ: Option[String] = None,
`type`: ReaderType = ReaderTypes.numpy
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class ReadOci(
Expand Down Expand Up @@ -378,7 +378,7 @@ case class FilterCluster(
maxPoints: Option[Int] = None, // [default: UINT64_MAX]
tolerance: Option[Double] = None, // [default: 1.0]
`type`: FilterType = FilterTypes.cluster
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class FilterColorinterp(
Expand Down Expand Up @@ -500,7 +500,7 @@ case class FilterGridProjection(
case class FilterGroupBy(
dimension: String,
`type`: FilterType = FilterTypes.groupby
)
) extends PipelineExpr

@ConfiguredJsonCodec
case class FilterHag(
Expand Down
4 changes: 2 additions & 2 deletions examples/pdal-jni/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ resolvers ++= Seq(

fork := true

val pdalVersion = "2.1.2"
val pdalVersion = "2.1.3"

libraryDependencies ++= Seq(
"io.pdal" %% "pdal" % pdalVersion,
"io.pdal" %% "pdal-scala" % pdalVersion,
"io.pdal" % "pdal-native" % pdalVersion,
"org.scalatest" %% "scalatest" % "3.1.1" % Test
"org.scalatest" %% "scalatest" % "3.1.1" % Test
)
8 changes: 4 additions & 4 deletions scripts/merge-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ done
export PDAL_VERSION_SUFFIX=${PDAL_VERSION_SUFFIX-"-SNAPSHOT"}

cd ./native/target
rm -f ./pdal-native-2.1.2${PDAL_VERSION_SUFFIX}.jar
rm -f ./pdal-native-2.1.3${PDAL_VERSION_SUFFIX}.jar
rm -rf ./tmp; mkdir -p ./tmp

cd tmp; jar -xf ../pdal-native-x86_64-darwin-2.1.2${PDAL_VERSION_SUFFIX}.jar; cd ~-
cd tmp; jar -xf ../pdal-native-x86_64-linux-2.1.2${PDAL_VERSION_SUFFIX}.jar; cd ~-
cd tmp; jar -xf ../pdal-native-x86_64-darwin-2.1.3${PDAL_VERSION_SUFFIX}.jar; cd ~-
cd tmp; jar -xf ../pdal-native-x86_64-linux-2.1.3${PDAL_VERSION_SUFFIX}.jar; cd ~-

jar -cvf pdal-native-2.1.2${PDAL_VERSION_SUFFIX}.jar -C tmp .
jar -cvf pdal-native-2.1.3${PDAL_VERSION_SUFFIX}.jar -C tmp .

cd ./tmp