Merge pull request #374 from alexarchambault/topic/scala-2.12.0

Switch to scala 2.12.0 final
This commit is contained in:
Alexandre Archambault 2016-11-02 22:36:33 +01:00 committed by GitHub
commit 23bbfcc552
5 changed files with 11 additions and 10 deletions

View File

@ -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

View File

@ -20,7 +20,8 @@ build_script:
- sbt ++2.10.6 coreJVM/publishLocal cache/publishLocal # to make the scripted tests happy
test_script:
- ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:http-server-java7_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v }
- sbt ++2.11.8 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test?
- sbt ++2.12.0 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test?
- sbt ++2.11.8 testsJVM/test testsJVM/it:test
- sbt ++2.10.6 testsJVM/test testsJVM/it:test plugin/scripted
cache:
- C:\sbt\

View File

@ -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))
@ -107,7 +107,7 @@ lazy val commonSettings = scalaVersionAgnosticCommonSettings ++ Seq(
}
)
val scalazVersion = "7.2.6"
val scalazVersion = "7.2.7"
lazy val core = crossProject
.settings(commonSettings: _*)
@ -259,7 +259,7 @@ lazy val tests = crossProject
if (scalaBinaryVersion.value == "2.10")
"0.9.5"
else
"0.9.6-RC6"
"0.9.6"
"org.scala-lang.modules" %% "scala-async" % asyncVersion % "provided"
},
@ -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 ++= {

View File

@ -2,7 +2,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.8.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.5")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.6")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14")
addSbtPlugin("com.typesafe.sbt" % "sbt-proguard" % "0.2.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11")

View File

@ -5,4 +5,4 @@ io.get-coursier:coursier_2.11:1.0.0-SNAPSHOT:compile
org.jsoup:jsoup:1.9.2:default
org.scala-lang:scala-library:2.11.8:default
org.scala-lang.modules:scala-xml_2.11:1.0.5:default
org.scalaz:scalaz-core_2.11:7.2.6:default
org.scalaz:scalaz-core_2.11:7.2.7:default