Skip to content

Commit 20b8db2

Browse files
committed
Drop JDK6 and Scala 2.11 from build
1 parent 61efbd7 commit 20b8db2

File tree

4 files changed

+3
-45
lines changed

4 files changed

+3
-45
lines changed

Diff for: .sbtrepos

-8
This file was deleted.

Diff for: .travis.yml

-28
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
language: scala
22

3-
# Needed for openjdk6
4-
dist: precise
5-
sudo: required
6-
addons:
7-
hosts:
8-
- localhost
9-
hostname: localhost.local
10-
113
jdk:
12-
- openjdk6
134
- oraclejdk8
145
- openjdk11
156

167
scala:
17-
- 2.11.12
188
- 2.12.8
199
- 2.13.0-RC1
2010

@@ -38,26 +28,8 @@ matrix:
3828
env: SCALAJS_VERSION=0.6.27
3929
- jdk: openjdk11
4030
env: SCALAJS_VERSION=1.0.0-M7
41-
- scala: 2.11.12
42-
env: SCALAJS_VERSION=1.0.0-M7
43-
- scala: 2.11.12
44-
jdk: oraclejdk8
45-
- scala: 2.11.12
46-
jdk: openjdk11
47-
- scala: 2.12.8
48-
jdk: openjdk6
49-
- scala: 2.13.0-RC1
50-
jdk: openjdk6
51-
52-
before_script:
53-
- nvm install 8
54-
- nvm use 8
5531

5632
script:
57-
# work around https://github.com/travis-ci/travis-ci/issues/9713
58-
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
59-
- java -version
60-
- node -v
6133
- admin/build.sh
6234

6335
before_cache:

Diff for: admin/build.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ set -e
1616
# of the existing tag. Then a new tag can be created for that commit, e.g., `v1.2.3#2.13.0-M5`.
1717
# Everything after the `#` in the tag name is ignored.
1818

19-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* \
20-
|| "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
19+
if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
2120
RELEASE_COMBO=true;
2221
fi
2322

@@ -52,9 +51,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
5251
fi
5352
fi
5453

55-
# Maven Central and Bintray are unreachable over HTTPS
56-
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
57-
SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos"
58-
fi
59-
60-
sbt $SBTOPTS "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"
54+
sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"

Diff for: build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sbtcrossproject.{crossProject, CrossType}
22
import ScalaModulePlugin._
33

4-
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC1")
4+
crossScalaVersions in ThisBuild := List("2.12.8", "2.13.0-RC1")
55

66
lazy val xml = crossProject(JSPlatform, JVMPlatform)
77
.withoutSuffixFor(JVMPlatform)

0 commit comments

Comments
 (0)