diff --git a/.travis.yml b/.travis.yml index 714aaabaf..ea6789364 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,10 +30,13 @@ before_install: install: - sdk install java $TRAVIS_JDK + - bin/fixpreloaded.sh - unset _JAVA_OPTIONS - java -Xmx32m -version # detect sbt version from project/build.properties - - export TRAVIS_SBT=$(grep sbt.version= project/build.properties | sed -e 's/sbt.version=//g' ) && echo "sbt $TRAVIS_SBT" + # - export TRAVIS_SBT=$(grep sbt.version= project/build.properties | sed -e 's/sbt.version=//g' ) && echo "sbt $TRAVIS_SBT" + # use 1.2.8 until 1.3.0 installer is out + - export TRAVIS_SBT=1.2.8 - sdk install sbt $TRAVIS_SBT # override Travis CI's SBT_OPTS - unset SBT_OPTS diff --git a/bin/fixpreloaded.sh b/bin/fixpreloaded.sh new file mode 100755 index 000000000..ac57c3596 --- /dev/null +++ b/bin/fixpreloaded.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/org.scala-lang.modules/scala-parser-combinators_2.12/1.0.4 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/org.scala-lang.modules/scala-parser-combinators_2.12/1.0.5 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/org.scala-lang.modules/scala-xml_2.12/1.0.6 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/com.typesafe/config/1.2.0 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/com.typesafe/ssl-config-core_2.12/0.2.2 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/com.google.protobuf/protobuf-java/3.3.1 +rm -rf $HOME/.sdkman/candidates/sbt/current/lib/local-preloaded/org.scala-lang/scala-compiler/2.12.6 + +rm -rf $HOME/.sbt/preloaded/org.scala-lang.modules/scala-parser-combinators_2.12/1.0.4 +rm -rf $HOME/.sbt/preloaded/org.scala-lang.modules/scala-parser-combinators_2.12/1.0.5 +rm -rf $HOME/.sbt/preloaded/org.scala-lang.modules/scala-xml_2.12/1.0.6 +rm -rf $HOME/.sbt/preloaded/com.typesafe/config/1.2.0 +rm -rf $HOME/.sbt/preloaded/com.typesafe/ssl-config-core_2.12/0.2.2 +rm -rf $HOME/.sbt/preloaded/com.google.protobuf/protobuf-java/3.3.1 +rm -rf $HOME/.sbt/preloaded/org.scala-lang/scala-compiler/2.12.6 diff --git a/build.sbt b/build.sbt index 4b71318ee..b5f6d6d4c 100644 --- a/build.sbt +++ b/build.sbt @@ -7,6 +7,8 @@ val _ = { sys.props += ("line.separator" -> "\n") } +ThisBuild / Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat + def commonSettings: Seq[Setting[_]] = Def.settings( scalaVersion := scala212, // publishArtifact in packageDoc := false, diff --git a/project/build.properties b/project/build.properties index c0bab0494..c59667ce9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.0-M3