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

new 1.1.x branch for Scala 2.12 only #73

Merged
merged 2 commits into from
Jan 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ env:
script: admin/build.sh

jdk:
- openjdk6
- oraclejdk8

notifications:
email: adriaan.moors@typesafe.com
email:
- adriaan.moors@lightbend.com
- seth.tisue@lightbend.com
24 changes: 4 additions & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,18 @@ scalaModuleSettings

name := "scala-partest"

version := "1.0.19-SNAPSHOT"
version := "1.1.0-SNAPSHOT"

scalaVersion := crossScalaVersions.value.head

crossScalaVersions := {
val java = System.getProperty("java.version")
if (java.startsWith("1.6."))
Seq("2.11.8")
else if (java.startsWith("1.8."))
Seq("2.12.1")
else
sys.error(s"don't know what Scala versions to build on $java")
}
crossScalaVersions := Seq("2.12.1")

scalaXmlVersion := {
if (scalaVersion.value.startsWith("2.11.")) "1.0.4" else "1.0.6"
}
scalaXmlVersion := "1.0.6"

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

// dependencies
// versions involved in integration builds / that change frequently should be keys, set above!
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.8
sbt.version=0.13.13