Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Improvements for the Scala SBT build #49

Merged
merged 2 commits into from
Feb 9, 2016
Merged

Improvements for the Scala SBT build #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
277e813
Make scalaXmlVersion logic friendly to future 2.12 releases
retronym Feb 6, 2016
d762fef
Honour --srcpath through the SBT runner
retronym Feb 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ crossScalaVersions := {
if (java.startsWith("1.6."))
Seq("2.11.7", "2.12.0-M1")
else if (java.startsWith("1.8."))
Seq("2.12.0-M2", "2.12.0-M3")
Seq("2.12.0-M3")
else
sys.error(s"don't know what Scala versions to build on $java")
}

scalaXmlVersion := {
if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"
if(scalaVersion.value.startsWith("2.11.") || scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"
}

scalaCheckVersion := "1.11.6"
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/tools/partest/nest/SBTRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SBTRunner(partestFingerprint: Fingerprint, eventHandler: EventHandler, log
}

override val suiteRunner = new SuiteRunner(
testSourcePath = Option(srcDir) getOrElse PartestDefaults.sourcePath,
testSourcePath = optSourcePath orElse Option(srcDir) getOrElse PartestDefaults.sourcePath,
new FileManager(testClassLoader = testClassLoader),
updateCheck = optUpdateCheck,
failed = optFailed,
Expand Down