Fix Scala DSL hierarchy (#31)

PDAL · Mar 3, 2020 · d46e71c · d46e71c
1 parent 7acf3e7
commit d46e71c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)

diff --git a/README.md b/README.md
@@ -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
 )
 ```
 
@@ -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
 )
 ```
 

diff --git a/build.sbt b/build.sbt
@@ -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",

diff --git a/core-scala/src/main/scala/io/pdal/pipeline/PipelineExpressions.scala b/core-scala/src/main/scala/io/pdal/pipeline/PipelineExpressions.scala
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -500,7 +500,7 @@ case class FilterGridProjection(
 case class FilterGroupBy(
   dimension: String,
   `type`: FilterType = FilterTypes.groupby
-)
+) extends PipelineExpr
 
 @ConfiguredJsonCodec
 case class FilterHag(

diff --git a/examples/pdal-jni/build.sbt b/examples/pdal-jni/build.sbt
@@ -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
 )
diff --git a/scripts/merge-native.sh b/scripts/merge-native.sh
@@ -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