diff --git a/.travis.yml b/.travis.yml index f3e6666e8..4baeb92da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ script: # - bash <(curl -s https://codecov.io/bash) matrix: include: - - env: TRAVIS_SCALA_VERSION=2.12.0-RC2 PUBLISH=1 + - env: TRAVIS_SCALA_VERSION=2.12.0 PUBLISH=1 os: linux jdk: oraclejdk8 - env: TRAVIS_SCALA_VERSION=2.11.8 PUBLISH=1 diff --git a/build.sbt b/build.sbt index 22acfc0e4..cf93ef33d 100644 --- a/build.sbt +++ b/build.sbt @@ -98,7 +98,7 @@ lazy val scalaVersionAgnosticCommonSettings = Seq( lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq( 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 ++= { if (scalaBinaryVersion.value == "2.10") Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full)) @@ -365,7 +365,7 @@ lazy val bootstrap = project lazy val cli = project .dependsOn(coreJvm, cache) .settings(commonSettings) - .settings(noPublishForScalaVersionSettings("2.10", "2.12.0-RC2")) + .settings(noPublishForScalaVersionSettings("2.10", "2.12")) .settings(packAutoSettings) .settings(proguardSettings) .settings( @@ -539,7 +539,7 @@ lazy val doc = project lazy val plugin = project .dependsOn(coreJvm, cache) .settings(scalaVersionAgnosticCommonSettings) - .settings(noPublishForScalaVersionSettings("2.11", "2.12.0-RC2")) + .settings(noPublishForScalaVersionSettings("2.11", "2.12")) .settings( name := "sbt-coursier", sbtPlugin := (scalaBinaryVersion.value == "2.10"), @@ -567,7 +567,7 @@ val http4sVersion = "0.8.6" lazy val `http-server` = project .settings(commonSettings) .settings(packAutoSettings) - .settings(noPublishForScalaVersionSettings("2.10", "2.12.0-RC2")) + .settings(noPublishForScalaVersionSettings("2.10", "2.12")) .settings( name := "http-server-java7", libraryDependencies ++= {