Skip to content

Commit 5adeae2

Browse files
committed
Update sbt and travis CI
1 parent 607dc66 commit 5adeae2

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

.travis.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
sudo: false
2+
language: scala
3+
addons:
4+
hostname: localhost
5+
services:
6+
- docker
7+
jdk:
8+
- oraclejdk8
9+
scala:
10+
- 2.11.11
11+
cache:
12+
directories:
13+
- $HOME/.ivy2
14+
- $HOME/.sbt
15+
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 pdal/dependencies:latest /bin/bash -c "cd /pdal-java; ./sbt test"
17+
notifications:
18+
email:
19+
recipients:
20+

project/Commands.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object Commands {
3939
Command.command(s"${commandProcess}Javastyle")((state: State) => {
4040
val extracted = Project extract state
4141
import extracted._
42-
commandProcess :: append(Seq(crossPaths := false), state)
42+
commandProcess :: appendWithoutSession(Seq(crossPaths := false), state)
4343
})
4444
}
4545
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.0.2
1+
sbt.version=1.1.1

sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
#
33
# A more capable sbt runner, coincidentally also called sbt.
44
# Author: Paul Phillips <[email protected]>
5+
# https://github.com/paulp/sbt-extras
56

67
set -o pipefail
78

89
declare -r sbt_release_version="0.13.16"
910
declare -r sbt_unreleased_version="0.13.16"
1011

1112
declare -r latest_213="2.13.0-M2"
12-
declare -r latest_212="2.12.3"
13-
declare -r latest_211="2.11.11"
14-
declare -r latest_210="2.10.6"
13+
declare -r latest_212="2.12.4"
14+
declare -r latest_211="2.11.12"
15+
declare -r latest_210="2.10.7"
1516
declare -r latest_29="2.9.3"
1617
declare -r latest_28="2.8.2"
1718

@@ -259,9 +260,9 @@ download_url () {
259260
echoerr " To $jar"
260261

261262
mkdir -p "${jar%/*}" && {
262-
if which curl >/dev/null; then
263+
if command -v curl > /dev/null 2>&1; then
263264
curl --fail --silent --location "$url" --output "$jar"
264-
elif which wget >/dev/null; then
265+
elif command -v wget > /dev/null 2>&1; then
265266
wget -q -O "$jar" "$url"
266267
fi
267268
} && [[ -r "$jar" ]]

0 commit comments

Comments
 (0)