Skip to content

Commit

Permalink
Scala 2.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
eed3si9n committed Jan 7, 2017
1 parent b5641de commit 65a62e8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 20 deletions.
14 changes: 2 additions & 12 deletions .travis.yml
@@ -1,4 +1,3 @@
# Use container-based build
sudo: false

language: scala
Expand All @@ -9,16 +8,7 @@ script:
scala:
- 2.10.6
- 2.11.8
- 2.12.1

jdk:
- openjdk7
- openjdk6

notifications:
email:
- sbt-dev-bot@googlegroups.com

matrix:
include:
- scala: 2.12.0
jdk: oraclejdk8
- oraclejdk8
10 changes: 4 additions & 6 deletions build.sbt
Expand Up @@ -11,10 +11,9 @@ lazy val root = (project in file(".")).
organizationHomepage := Some(url("http://scala-sbt.org/")),
homepage := Some(url("https://github.com/sbt/sbinary")),
version := "0.4.4-SNAPSHOT",
scalaVersion := "2.10.6",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0"),
scalaVersion := "2.12.1",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1"),
bintrayPackage := "sbinary",
scalacOptions -= "-Yinline-warnings", // TODO remove when new sbt-houserules released https://github.com/sbt/sbt-houserules/commit/58df10f
developers := List(
Developer("drmaciver", "David R. MacIver", "@drmaciver", url("https://github.com/DRMacIver")),
Developer("harrah", "Mark Harrah", "@harrah", url("https://github.com/harrah")),
Expand All @@ -33,10 +32,9 @@ lazy val core = (project in file("core")).
settings(
name := "SBinary",
Fmpp.templateSettings,
scalacOptions -= "-Yinline-warnings",
libraryDependencies += scalacheck % Test,
libraryDependencies <++= scalaVersion(scalaXmlDep),
unmanagedResources in Compile <+= baseDirectory map { _ / "LICENSE" }
libraryDependencies ++= scalaVersion(scalaXmlDep).value,
unmanagedResources in Compile += (baseDirectory map { _ / "LICENSE" } ).value
)

lazy val treeExample = (project in (file("examples") / "bt")).
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.13
2 changes: 1 addition & 1 deletion project/houserules.sbt
@@ -1 +1 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.1")
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.2")

0 comments on commit 65a62e8

Please sign in to comment.