Skip to content

Commit f43e772

Browse files
Bump openjdk6 to openjdk7
We cannot use openjdk6 since maven central wont serve TLS1.0 Server access Error: Received fatal alert: protocol_version url=https://repo1.maven.org/maven2/org/scala-sbt/compiler-interface/0.13.17/compiler-interface-0.13.17.jar see https://stackoverflow.com/a/50824799/449071
1 parent 58a01af commit f43e772

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

.travis.yml

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
# slower instance startup, but needed to work around https://github.com/travis-ci/travis-ci/issues/9713
2-
sudo: true
3-
41
language: scala
52

6-
addons:
7-
apt:
8-
packages:
9-
- openjdk-6-jdk
103
scala:
114
- 2.11.12
125
- 2.12.6
136
- 2.13.0-M4
147
jdk:
15-
- openjdk6
8+
- openjdk7
169
- oraclejdk8
1710
env:
1811
global:
@@ -29,23 +22,41 @@ env:
2922

3023
matrix:
3124
exclude:
32-
- jdk: openjdk6
25+
# > 2.12 requires jdk8
26+
- jdk: openjdk7
3327
scala: 2.12.6
34-
- jdk: openjdk6
28+
29+
- jdk: openjdk7
3530
scala: 2.13.0-M4
31+
32+
# ?
3633
- jdk: oraclejdk8
3734
scala: 2.11.12
35+
36+
# 2.13.0-M4 is not available in Scala.js 1.0.0-M3
3837
- scala: 2.13.0-M4
3938
env: SCALAJS_VERSION=1.0.0-M3
39+
40+
# run migration test
4041
include:
4142
- scala: 2.12.6
4243
jdk: oraclejdk8
4344
env: TEST_SCALAFIX=true
4445

46+
# | jdk | scala | scala target | scala target version | scalafix test |
47+
# | ----------- | --------- | ------------ | -------------------- |---------------|
48+
# | openjdk7 | 2.11.12 | jvm | | |
49+
# | openjdk7 | 2.11.12 | js | 0.6.23 | |
50+
# | openjdk7 | 2.11.12 | js | 1.0.0-M3 | |
51+
# | oraclejdk8 | 2.12.6 | jvm | | |
52+
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
53+
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |
54+
# | oraclejdk8 | 2.13.0-M4 | jvm | | |
55+
# | oraclejdk8 | 2.13.0-M4 | js | 0.6.23 | |
56+
# | oraclejdk8 | 2.12.6 | jvm | | true |
57+
4558
before_script: ./checkCLA.sh
4659
script:
47-
# work around https://github.com/travis-ci/travis-ci/issues/9713
48-
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
4960
- java -version
5061
- admin/build.sh
5162

admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
5252
fi
5353
fi
5454
55-
sbt "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"
55+
sbt -Dhttps.protocols=TLSv1.2 "++$TRAVIS_SCALA_VERSION" "$publishVersion" "$projectPrefix/clean" "$projectPrefix/test" "$projectPrefix/publishLocal" "$publishTask"

0 commit comments

Comments
 (0)