diff --git a/.travis.yml b/.travis.yml index 3723a64..681d15c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/build.sbt b/build.sbt index 2be05fb..3ab7130 100644 --- a/build.sbt +++ b/build.sbt @@ -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! diff --git a/project/build.properties b/project/build.properties index a6e117b..27e88aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.8 +sbt.version=0.13.13