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

Commit d44b3a7

Browse files
committed
new 1.1.x branch for Scala 2.12 only
2.11 development is winding down, so let's declare the 1.0.x series to be 2.11 only, and start a new 1.1.x series for 2.12+
1 parent d68f47a commit d44b3a7

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

build.sbt

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,18 @@ scalaModuleSettings
44

55
name := "scala-partest"
66

7-
version := "1.0.19-SNAPSHOT"
7+
version := "1.1.0-SNAPSHOT"
88

99
scalaVersion := crossScalaVersions.value.head
1010

11-
crossScalaVersions := {
12-
val java = System.getProperty("java.version")
13-
if (java.startsWith("1.6."))
14-
Seq("2.11.8")
15-
else if (java.startsWith("1.8."))
16-
Seq("2.12.1")
17-
else
18-
sys.error(s"don't know what Scala versions to build on $java")
19-
}
11+
crossScalaVersions := Seq("2.12.1")
2012

21-
scalaXmlVersion := {
22-
if (scalaVersion.value.startsWith("2.11.")) "1.0.4" else "1.0.6"
23-
}
13+
scalaXmlVersion := "1.0.6"
2414

2515
// TODO: eliminate "-deprecation:false" for nightlies,
2616
// included by default because we don't want to break scala/scala pr validation
2717
scalacOptions ++=
28-
Seq("-feature", "-deprecation:false", "-unchecked", "-Xlint", "-Xfatal-warnings") ++
29-
(CrossVersion.partialVersion(scalaVersion.value) match {
30-
case Some((2, scalaMajor)) if scalaMajor < 12 =>
31-
Seq("-optimize")
32-
case _ =>
33-
Seq() // maybe "-Yopt:l:classpath" eventually?
34-
})
18+
Seq("-feature", "-deprecation:false", "-unchecked", "-Xlint", "-Xfatal-warnings")
3519

3620
// dependencies
3721
// versions involved in integration builds / that change frequently should be keys, set above!

0 commit comments

Comments
 (0)