Skip to content

Commit 86f570d

Browse files
authored
Merge pull request #172 from gourlaysama/build/fix-jdk6
Fix JDK6 build: use http-only repos for JDK6
2 parents de1c5f2 + fffeee1 commit 86f570d

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

Diff for: .sbtrepos

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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: http://repo1.maven.org/maven2/
6+
sonatype-public: http://oss.sonatype.org/content/repositories/public
7+
typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
8+
sbt-ivy-releases: http://repo.scala-sbt.org/scalasbt/sbt-plugin-releases/, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly

Diff for: admin/build.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,8 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
5050
openssl aes-256-cbc -K $K -iv $IV -in admin/secring.asc.enc -out admin/secring.asc -d
5151
fi
5252
53-
sbt "$publishVersion" "$publishScalaVersion" clean update +test +publishLocal $extraTarget
53+
if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" ]]; then
54+
SBTOPTS="-Dsbt.override.build.repos=true -Dsbt.repository.config=./.sbtrepos"
55+
fi
56+
57+
sbt $SBTOPTS "$publishVersion" "$publishScalaVersion" clean update +test +publishLocal $extraTarget

0 commit comments

Comments
 (0)