Skip to content

Commit e0b0b2d

Browse files
Workaround scala#77 use maven central over http
1 parent a4f7b08 commit e0b0b2d

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ scala:
55
- 2.12.6
66
- 2.13.0-M4
77
jdk:
8-
- openjdk7
8+
- openjdk6
99
- oraclejdk8
1010
env:
1111
global:
@@ -23,10 +23,10 @@ env:
2323
matrix:
2424
exclude:
2525
# > 2.12 requires jdk8
26-
- jdk: openjdk7
26+
- jdk: openjdk6
2727
scala: 2.12.6
2828

29-
- jdk: openjdk7
29+
- jdk: openjdk6
3030
scala: 2.13.0-M4
3131

3232
# ?
@@ -45,9 +45,9 @@ matrix:
4545

4646
# | jdk | scala | scala target | scala target version | scalafix test |
4747
# | ----------- | --------- | ------------ | -------------------- |---------------|
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 | |
48+
# | openjdk6 | 2.11.12 | jvm | | |
49+
# | openjdk6 | 2.11.12 | js | 0.6.23 | |
50+
# | openjdk6 | 2.11.12 | js | 1.0.0-M3 | |
5151
# | oraclejdk8 | 2.12.6 | jvm | | |
5252
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
5353
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |

admin/build.sh

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ set -e
1818

1919
RELEASE_COMBO=true
2020

21+
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
22+
# https://github.com/sbt/sbt/blob/3972b7a3fcc8ea2e4c987e6c1adc13468f49e0be/launch/src/main/input_resources/sbt/sbt.boot.properties#L13-L19
23+
mkdir -p ~/.sbt
24+
cp admin/repositories-jdk6 ~/.sbt/repositories
25+
fi
26+
2127
if [ "$SCALAJS_VERSION" = "" ]; then
2228
if [[ "$TEST_SCALAFIX" == "true" ]]; then
2329
projectPrefix="scalafixRules"

admin/repositories-jdk6

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[repositories]
2+
local
3+
local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
4+
local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}
5+
maven-central-over-http: http://repo1.maven.org/maven2/
6+
typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
7+
sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly

0 commit comments

Comments
 (0)