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

Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3 #43

Merged
merged 2 commits into from
Dec 4, 2015
Merged

Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3 #43

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10f9080
Build for Scala 2.11.7, 2.12.0-M1, 2.12.0-M2 and 2.12.0-M3
szeiger Dec 3, 2015
1c78ce6
Locate partest-javaagent in classpath
szeiger Dec 3, 2015
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
10 changes: 6 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ scalaModuleSettings

name := "scala-partest"

version := "1.0.11-SNAPSHOT"
version := "1.0.12-SNAPSHOT"

scalaVersion := crossScalaVersions.value.head

crossScalaVersions := {
val java = System.getProperty("java.version")
if (java.startsWith("1.6."))
Seq("2.11.6", "2.12.0-M1")
Seq("2.11.7", "2.12.0-M1")
else if (java.startsWith("1.8."))
Seq("2.12.0-M2")
Seq("2.12.0-M2", "2.12.0-M3")
else
sys.error(s"don't know what Scala versions to build on $java")
}

scalaXmlVersion := "1.0.4"
scalaXmlVersion := {
if(scalaVersion.value == "2.12.0-M3") "1.0.5" else "1.0.4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

won't this break as soon as we do M4? how about if(scalaVersion.value == "2.12.0-M2") "1.0.4" else "1.0.5"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When we do M4 (and it's not binary compatible), we need to update scala-partest anyway (and scala-xml may well be an even newer version then), so I don't think it really makes a difference which way you write that check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the way it is at the moment is easier. We need 1.0.5 for 2.12.0-M3 and 1.0.4 for 2.12.0-M2, 2.12.0-M1 and 2.11.

}

scalaCheckVersion := "1.11.6"

Expand Down