Skip to content

Commit cb49b1a

Browse files
committed
remove vestiges of JDK 6 build
some of this is just cleanup, but there is an actual fix: we weren't setting RELEASE_COMBO correctly for the 2.11 build, so no 2.11 artifacts would be published
1 parent 8aea017 commit cb49b1a

File tree

4 files changed

+3
-18
lines changed

4 files changed

+3
-18
lines changed

.sbtrepos

Lines changed: 0 additions & 8 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
sudo: required
2-
31
language: scala
42
jdk:
53
- oraclejdk8

admin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ env:
4040
script: admin/build.sh
4141
4242
jdk:
43-
- openjdk6
4443
- oraclejdk8
44+
- openjdk11
4545
4646
notifications:
4747
email:

admin/build.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ if [[ "$SCALANATIVE_VERSION" != "" ]]; then
2121
if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* ]]; then
2222
RELEASE_COMBO=true;
2323
fi
24-
elif [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* \
25-
|| "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
24+
elif [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then
2625
RELEASE_COMBO=true;
2726
fi
2827

@@ -60,8 +59,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
6059
fi
6160
fi
6261

63-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
64-
SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos"
65-
fi
66-
67-
sbt $SBTOPTS "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/update" "$projectPrefix/compile" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"
62+
sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/update" "$projectPrefix/compile" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"

0 commit comments

Comments
 (0)