Skip to content

Commit 0b3a335

Browse files
committed
Update example project
1 parent f7c78e7 commit 0b3a335

File tree

4 files changed

+20
-11
lines changed

4 files changed

+20
-11
lines changed

examples/pdal-jni/build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
val scala212 = "2.12.17"
2-
val scala213 = "2.13.10"
3-
val scala3 = "3.2.1"
1+
val scala212 = "2.12.18"
2+
val scala213 = "2.13.12"
3+
val scala3 = "3.3.1"
44
val scalaVersions = Seq(scala3, scala213, scala212)
55

66
name := "pdal-jni"
@@ -23,11 +23,11 @@ resolvers ++= Resolver.sonatypeOssRepos("releases") ++ Resolver.sonatypeOssRepos
2323

2424
fork := true
2525

26-
val pdalVersion = "2.4.0"
26+
val pdalVersion = "2.5.1"
2727

2828
libraryDependencies ++= Seq(
2929
"io.pdal" %% "pdal" % pdalVersion,
3030
"io.pdal" %% "pdal-scala" % pdalVersion,
3131
"io.pdal" % "pdal-native" % pdalVersion,
32-
"org.scalatest" %% "scalatest" % "3.2.14" % Test
32+
"org.scalatest" %% "scalatest" % "3.2.17" % Test
3333
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=1.5.5
1+
sbt.version=1.9.6
22

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
1+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3")

examples/pdal-jni/sbt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434

3535
set -o pipefail
3636

37-
declare -r sbt_release_version="1.8.0"
38-
declare -r sbt_unreleased_version="1.8.0"
37+
declare -r sbt_release_version="1.9.6"
38+
declare -r sbt_unreleased_version="1.9.6"
3939

40-
declare -r latest_213="2.13.10"
41-
declare -r latest_212="2.12.17"
40+
declare -r latest_213="2.13.12"
41+
declare -r latest_212="2.12.18"
4242
declare -r latest_211="2.11.12"
4343
declare -r latest_210="2.10.7"
4444
declare -r latest_29="2.9.3"
@@ -388,10 +388,12 @@ usage() {
388388
set_sbt_version
389389
cat <<EOM
390390
Usage: $script_name [options]
391+
391392
Note that options which are passed along to sbt begin with -- whereas
392393
options to this runner use a single dash. Any sbt command can be scheduled
393394
to run first by prefixing the command with --, so --warn, --error and so on
394395
are not special.
396+
395397
-h | -help print this message
396398
-v verbose operation (this runner is chattier)
397399
-d, -w, -q aliases for --debug, --warn, --error (q means quiet)
@@ -409,13 +411,15 @@ are not special.
409411
-batch Disable interactive mode
410412
-prompt <expr> Set the sbt prompt; in expr, 's' is the State and 'e' is Extracted
411413
-script <file> Run the specified file as a scala script
414+
412415
# sbt version (default: sbt.version from $buildProps if present, otherwise $sbt_release_version)
413416
-sbt-version <version> use the specified version of sbt (default: $sbt_release_version)
414417
-sbt-force-latest force the use of the latest release of sbt: $sbt_release_version
415418
-sbt-dev use the latest pre-release version of sbt: $sbt_unreleased_version
416419
-sbt-jar <path> use the specified jar as the sbt launcher
417420
-sbt-launch-dir <path> directory to hold sbt launchers (default: $sbt_launch_dir)
418421
-sbt-launch-repo <url> repo url for downloading sbt launcher jar (default: $(url_base "$sbt_version"))
422+
419423
# scala version (default: as chosen by sbt)
420424
-28 use $latest_28
421425
-29 use $latest_29
@@ -426,8 +430,10 @@ are not special.
426430
-scala-home <path> use the scala build at the specified directory
427431
-scala-version <version> use the specified version of scala
428432
-binary-version <version> use the specified scala version when searching for dependencies
433+
429434
# java version (default: java from PATH, currently $(java -version 2>&1 | grep version))
430435
-java-home <path> alternate JAVA_HOME
436+
431437
# passing options to the jvm - note it does NOT use JAVA_OPTS due to pollution
432438
# The default set is used if JVM_OPTS is unset and no -jvm-opts file is found
433439
<default> $(default_jvm_opts)
@@ -437,12 +443,14 @@ are not special.
437443
-jvm-opts <path> file containing jvm args (if not given, .jvmopts in project root is used if present)
438444
-Dkey=val pass -Dkey=val directly to the jvm
439445
-J-X pass option -X directly to the jvm (-J is stripped)
446+
440447
# passing options to sbt, OR to this runner
441448
SBT_OPTS environment variable holding either the sbt args directly, or
442449
the reference to a file containing sbt args if given path is prepended by '@' (e.g. '@/etc/sbtopts')
443450
Note: "@"-file is overridden by local '.sbtopts' or '-sbt-opts' argument.
444451
-sbt-opts <path> file containing sbt args (if not given, .sbtopts in project root is used if present)
445452
-S-X add -X to sbt's scalacOptions (-S is stripped)
453+
446454
# passing options exclusively to this runner
447455
SBTX_OPTS environment variable holding either the sbt-extras args directly, or
448456
the reference to a file containing sbt-extras args if given path is prepended by '@' (e.g. '@/etc/sbtxopts')
@@ -595,6 +603,7 @@ fi
595603
$(pwd) doesn't appear to be an sbt project.
596604
If you want to start sbt anyway, run:
597605
$0 -sbt-create
606+
598607
EOM
599608
exit 1
600609
}

0 commit comments

Comments
 (0)