From e0b0b2d6fc27539269c0b174f4bd8434b9e30fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Mon, 2 Jul 2018 12:05:23 +0200 Subject: [PATCH] Workaround #77 use maven central over http --- .travis.yml | 12 ++++++------ admin/build.sh | 6 ++++++ admin/repositories-jdk6 | 7 +++++++ 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 admin/repositories-jdk6 diff --git a/.travis.yml b/.travis.yml index 80eaa60a..65963111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ scala: - 2.12.6 - 2.13.0-M4 jdk: - - openjdk7 + - openjdk6 - oraclejdk8 env: global: @@ -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 # ? @@ -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 | | diff --git a/admin/build.sh b/admin/build.sh index 52a555dd..c1e8dbcd 100755 --- a/admin/build.sh +++ b/admin/build.sh @@ -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" diff --git a/admin/repositories-jdk6 b/admin/repositories-jdk6 new file mode 100644 index 00000000..dcdf7b56 --- /dev/null +++ b/admin/repositories-jdk6 @@ -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://repo1.maven.org/maven2/ +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