luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to 2.12.0 final

This commit is contained in:
Alexandre Archambault 2016-10-31 14:55:11 +01:00
parent 9bc85b86e7
commit fc9f1e6816
No known key found for this signature in database
GPG Key ID: 14640A6839C263A9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ script:
# - bash <(curl -s https://codecov.io/bash) # - bash <(curl -s https://codecov.io/bash)
matrix: matrix:
include: include:
- env: TRAVIS_SCALA_VERSION=2.12.0-RC2 PUBLISH=1 - env: TRAVIS_SCALA_VERSION=2.12.0 PUBLISH=1
os: linux os: linux
jdk: oraclejdk8 jdk: oraclejdk8
- env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1 - env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1

8
build.sbt
View File

@ -98,7 +98,7 @@ lazy val scalaVersionAgnosticCommonSettings = Seq(
lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq( lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq(
scalaVersion := "2.11.8", scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.12.0-RC2", "2.11.8", "2.10.6"), crossScalaVersions := Seq("2.12.0", "2.11.8", "2.10.6"),
libraryDependencies ++= { libraryDependencies ++= {
if (scalaBinaryVersion.value == "2.10") if (scalaBinaryVersion.value == "2.10")
Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)) Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full))
@ -365,7 +365,7 @@ lazy val bootstrap = project
lazy val cli = project lazy val cli = project
.dependsOn(coreJvm, cache) .dependsOn(coreJvm, cache)
.settings(commonSettings) .settings(commonSettings)
.settings(noPublishForScalaVersionSettings("2.10", "2.12.0-RC2")) .settings(noPublishForScalaVersionSettings("2.10", "2.12"))
.settings(packAutoSettings) .settings(packAutoSettings)
.settings(proguardSettings) .settings(proguardSettings)
.settings( .settings(
@ -539,7 +539,7 @@ lazy val doc = project
lazy val plugin = project lazy val plugin = project
.dependsOn(coreJvm, cache) .dependsOn(coreJvm, cache)
.settings(scalaVersionAgnosticCommonSettings) .settings(scalaVersionAgnosticCommonSettings)
.settings(noPublishForScalaVersionSettings("2.11", "2.12.0-RC2")) .settings(noPublishForScalaVersionSettings("2.11", "2.12"))
.settings( .settings(
name := "sbt-coursier", name := "sbt-coursier",
sbtPlugin := (scalaBinaryVersion.value == "2.10"), sbtPlugin := (scalaBinaryVersion.value == "2.10"),
@ -567,7 +567,7 @@ val http4sVersion = "0.8.6"
lazy val `http-server` = project lazy val `http-server` = project
.settings(commonSettings) .settings(commonSettings)
.settings(packAutoSettings) .settings(packAutoSettings)
.settings(noPublishForScalaVersionSettings("2.10", "2.12.0-RC2")) .settings(noPublishForScalaVersionSettings("2.10", "2.12"))
.settings( .settings(
name := "http-server-java7", name := "http-server-java7",
libraryDependencies ++= { libraryDependencies ++= {