Skip to content

Commit

Permalink
Workaround scala#77 use maven central over http
Browse files Browse the repository at this point in the history
  • Loading branch information
MasseGuillaume committed Jul 2, 2018
1 parent a4f7b08 commit e6c579e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ scala:
- 2.12.6
- 2.13.0-M4
jdk:
- openjdk7
- openjdk6
- oraclejdk8
env:
global:
Expand All @@ -23,10 +23,10 @@ env:
matrix:
exclude:
# > 2.12 requires jdk8
- jdk: openjdk7
- jdk: openjdk6
scala: 2.12.6

- jdk: openjdk7
- jdk: openjdk6
scala: 2.13.0-M4

# ?
Expand All @@ -45,9 +45,9 @@ matrix:

# | jdk | scala | scala target | scala target version | scalafix test |
# | ----------- | --------- | ------------ | -------------------- |---------------|
# | openjdk7 | 2.11.12 | jvm | | |
# | openjdk7 | 2.11.12 | js | 0.6.23 | |
# | openjdk7 | 2.11.12 | js | 1.0.0-M3 | |
# | openjdk6 | 2.11.12 | jvm | | |
# | openjdk6 | 2.11.12 | js | 0.6.23 | |
# | openjdk6 | 2.11.12 | js | 1.0.0-M3 | |
# | oraclejdk8 | 2.12.6 | jvm | | |
# | oraclejdk8 | 2.12.6 | js | 0.6.23 | |
# | oraclejdk8 | 2.12.6 | js | 1.0.0-M3 | |
Expand Down
6 changes: 6 additions & 0 deletions admin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ set -e

RELEASE_COMBO=true

if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
# https://github.com/sbt/sbt/blob/3972b7a3fcc8ea2e4c987e6c1adc13468f49e0be/launch/src/main/input_resources/sbt/sbt.boot.properties#L13-L19
mkdir -p ~/.sbt
cp admin/repositories-jdk6 ~/.sbt/repositories
fi

if [ "$SCALAJS_VERSION" = "" ]; then
if [[ "$TEST_SCALAFIX" == "true" ]]; then
projectPrefix="scalafixRules"
Expand Down
7 changes: 7 additions & 0 deletions admin/repositories-jdk6
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[repositories]
local
local-preloaded-ivy: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
local-preloaded: file:///${sbt.preloaded-${sbt.global.base-${user.home}/.sbt}/preloaded/}
maven-central-over-http: http://repo.maven.org/
typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly

0 comments on commit e6c579e

Please sign in to comment.