Skip to content

Commit 2ef8b6b

Browse files
committed
Bump Scala versions up, run tests against two Scala versions
1 parent 0225cc8 commit 2ef8b6b

File tree

6 files changed

+24
-5
lines changed

6 files changed

+24
-5
lines changed

.sbtopts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
-J-Xmx4G
1+
-J-Xmx2G
2+
-J-Xss512M
23
-Djava.awt.headless=true
34
-Dsun.io.serialization.extendedDebugInfo=true

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
sudo: false
2+
before_install:
3+
- docker pull daunnc/pdal:1.7.1
24
language: scala
35
addons:
46
hostname: localhost
@@ -7,13 +9,14 @@ services:
79
jdk:
810
- oraclejdk8
911
scala:
10-
- 2.11.11
12+
- 2.11.12
13+
- 2.12.5
1114
cache:
1215
directories:
1316
- $HOME/.ivy2
1417
- $HOME/.sbt
1518
script:
16-
- docker run -it --net=host -v $HOME/.ivy2:/root/.ivy2 -v $HOME/.sbt:/root/.sbt -v $TRAVIS_BUILD_DIR:/pdal-java -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.7.1 /bin/bash -c "cd /pdal-java; ./sbt test"
19+
- docker run -it --net=host -v $HOME/.ivy2:/root/.ivy2 -v $HOME/.sbt:/root/.sbt -v $TRAVIS_BUILD_DIR:/pdal-java -e TRAVIS_SCALA_VERSION=$TRAVIS_SCALA_VERSION -e TRAVIS_COMMIT=$TRAVIS_COMMIT -e TRAVIS_JDK_VERSION=$TRAVIS_JDK_VERSION daunnc/pdal:1.7.1 /bin/bash -c "cd /pdal-java; .travis/test-all.sh"
1720
notifications:
1821
email:
1922
recipients:

.travis/test-212.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
./sbt "-212" "project core" test
4+
./sbt "-212" "project core-scala" test

.travis/test-all.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
if [ `echo $TRAVIS_SCALA_VERSION | cut -f1-2 -d "."` = "2.11" ]; then
4+
.travis/test.sh;
5+
else
6+
.travis/test-212.sh
7+
fi

.travis/test.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
3+
./sbt "project core" test
4+
./sbt "project core-scala" test

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name := "pdal-jni"
22

33
lazy val commonSettings = Seq(
44
version := "1.7.0" + Environment.versionSuffix,
5-
scalaVersion := "2.11.11",
6-
crossScalaVersions := Seq("2.12.4", "2.11.11"),
5+
scalaVersion := "2.11.12",
6+
crossScalaVersions := Seq("2.12.5", "2.11.12"),
77
organization := "io.pdal",
88
description := "PDAL JNI bindings",
99
licenses := Seq("BSD" -> url("https://github.com/PDAL/PDAL/blob/master/LICENSE.txt")),

0 commit comments

Comments
 (0)