Skip to content

Commit

Permalink
Merge pull request #1457 from travisbrown/update/scala-2.12.0
Browse files Browse the repository at this point in the history
Update to Scala 2.12.0
  • Loading branch information
non committed Nov 8, 2016
2 parents 9af39fb + 6e4d727 commit 086d710
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jdk:

matrix:
include:
- scala: 2.12.0-RC2
- scala: 2.12.0
jdk: oraclejdk8

before_install:
Expand Down
21 changes: 11 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ lazy val botBuild = settingKey[Boolean]("Build by TravisCI instead of local dev

lazy val scoverageSettings = Seq(
coverageMinimum := 60,
coverageFailOnMinimum := false
coverageFailOnMinimum := false,
coverageScalacPluginVersion := "1.3.0"
)

lazy val buildSettings = Seq(
organization := "org.typelevel",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC2")
scalaVersion := "2.12.0",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0")
)

lazy val catsDoctestSettings = Seq(
Expand All @@ -41,9 +42,9 @@ lazy val commonSettings = Seq(
),
libraryDependencies ++= Seq(
"com.github.mpilquist" %%% "simulacrum" % "0.10.0",
"org.typelevel" %%% "machinist" % "0.6.0",
"org.typelevel" %%% "machinist" % "0.6.1",
compilerPlugin("org.scalamacros" %% "paradise" % "2.1.0" cross CrossVersion.full),
compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.2")
compilerPlugin("org.spire-math" %% "kind-projector" % "0.9.3")
),
fork in test := true,
parallelExecution in Test := false,
Expand Down Expand Up @@ -94,17 +95,17 @@ lazy val includeGeneratedSrc: Setting[_] = {

lazy val catsSettings = buildSettings ++ commonSettings ++ publishSettings ++ scoverageSettings ++ javadocSettings

lazy val scalaCheckVersion = "1.13.3"
lazy val scalaCheckVersion = "1.13.4"
lazy val scalaTestVersion = "3.0.0"
lazy val disciplineVersion = "0.7.1"
lazy val disciplineVersion = "0.7.2"

lazy val disciplineDependencies = Seq(
libraryDependencies += "org.scalacheck" %%% "scalacheck" % scalaCheckVersion,
libraryDependencies += "org.typelevel" %%% "discipline" % disciplineVersion)

lazy val testingDependencies = Seq(
libraryDependencies += "org.typelevel" %%% "catalysts-platform" % "0.0.4",
libraryDependencies += "org.typelevel" %%% "catalysts-macros" % "0.0.4" % "test",
libraryDependencies += "org.typelevel" %%% "catalysts-platform" % "0.0.5",
libraryDependencies += "org.typelevel" %%% "catalysts-macros" % "0.0.5" % "test",
libraryDependencies += "org.scalatest" %%% "scalatest" % scalaTestVersion % "test")


Expand Down Expand Up @@ -304,7 +305,7 @@ lazy val bench = project.dependsOn(macrosJVM, coreJVM, freeJVM, lawsJVM)
.settings(commonJvmSettings)
.settings(coverageEnabled := false)
.settings(libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-core" % "7.2.6"))
"org.scalaz" %% "scalaz-core" % "7.2.7"))
.enablePlugins(JmhPlugin)

// cats-js is JS-only
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13-RC3
sbt.version=0.13.13
10 changes: 7 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.3")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.16")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.4.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.1")

// Tut is transitively pulled in by sbt-microsites, but as of 0.3.1 that
// results in the wrong version (0.4.5 instead of 0.4.6).
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.6")

0 comments on commit 086d710

Please sign in to comment.