luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from eed3si9n/wip/bump 

sbt 1.3.0-M3
This commit is contained in:
eugene yokota 2019-05-10 09:39:34 -04:00 committed by GitHub
parent bc65dd5a99 25ff7d2dd5
commit faabc77123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -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

17
bin/fixpreloaded.sh Executable file
View File

@ -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

2
build.sbt
View File

@ -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,

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.0-M3