Skip to content

Commit 0a4a478

Browse files
[#81] Update sbt to 1.14.0 and use sbtn in builds (#82)
1 parent 113ddc6 commit 0a4a478

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,4 @@ metals.sbt
207207
.metals/*
208208
project/.bloop/*
209209
# End of https://www.gitignore.io/api/osx,sbt,java,linux,maven,scala,windows,intellij
210-
210+
.bsp/

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ language: scala
22
jdk: openjdk8
33
os: linux
44
dist: xenial
5+
before_script:
6+
- curl -L https://github.com/sbt/sbtn-dist/releases/download/v1.4.0/sbtn-x86_64-pc-linux-1.4.0.tar.gz | tar -xz
57
script:
68
if [[ ! -z "$TRAVIS_TAG" ]]; then ./publish.sh; else ./make.sh; fi
79
cache:
@@ -19,6 +21,8 @@ before_install:
1921
# https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
2022
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_a4f2ea8de7e1_key -iv $encrypted_a4f2ea8de7e1_iv -in rings.tar.enc -out rings.tar -d; fi
2123
- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then tar xvf rings.tar; fi
24+
env:
25+
- PATH=.:${PATH}
2226
git:
2327
depth: false
2428
branches:

make.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
22
set -ex
3-
sbt clean scalastyle +test +doc
4-
sbt darwin-hbase2-connector/clean darwin-hbase2-connector/scalastyle +darwin-hbase2-connector/test +darwin-hbase2-connector/doc
3+
if [ ! $TRAVIS ]; then
4+
sbtn shutdown
5+
fi
6+
sbtn "clean; scalastyle; +test; +doc"
7+
sbtn "darwin-hbase2-connector/clean; darwin-hbase2-connector/scalastyle; +darwin-hbase2-connector/test; +darwin-hbase2-connector/doc"

project/build.properties

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

project/plugin.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.2")
22
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.8")
3-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
43
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
54
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

publish.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
22
set -ex
3-
sbt clean scalastyle +test +publishSigned
4-
sbt darwin-hbase2-connector/clean darwin-hbase2-connector/scalastyle +darwin-hbase2-connector/test +darwin-hbase2-connector/publishSigned
3+
if [ ! $TRAVIS ]; then
4+
sbtn shutdown
5+
fi
6+
sbtn "clean; scalastyle; +test; +publishSigned"
7+
sbtn "darwin-hbase2-connector/clean; darwin-hbase2-connector/scalastyle; +darwin-hbase2-connector/test; +darwin-hbase2-connector/publishSigned"

0 commit comments

Comments
 (0)