Skip to content
This repository has been archived by the owner on Mar 25, 2020. It is now read-only.

Commit

Permalink
Update Scala to 2.12.0-RC2, etc. (#7)
Browse files Browse the repository at this point in the history
* Update Scala to 2.12.0-RC2, etc.

* Update Travis CI config as well

* Update sbt-scoverage for Scala 2.12.0-RC2
  • Loading branch information
travisbrown authored and Alistair-Johnson committed Oct 22, 2016
1 parent 6ad31b3 commit 9f29076
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 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-RC1
- scala: 2.12.0-RC2
jdk: oraclejdk8

script:
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ lazy val macrosJVM = macrosM.jvm
lazy val macrosJS = macrosM.js
lazy val macrosM = module("macros", CrossType.Pure)
.settings(typelevel.macroCompatSettings(vAll):_*)
.configure(disableScoverage210Js)
.configureCross(disableScoverage210Js)
.settings(fix2_12:_*)

/**
Expand Down Expand Up @@ -114,7 +114,7 @@ lazy val lawkitM = module("lawkit", CrossType.Pure)
.dependsOn(macrosM, testkitM)
.settings(typelevel.macroCompatSettings(vAll):_*)
.settings(disciplineDependencies:_*)
.configure(disableScoverage210Js)
.configureCross(disableScoverage210Js)
.settings(fix2_12:_*)

/**
Expand All @@ -136,7 +136,7 @@ lazy val testkitJS = testkitM.js
lazy val testkitM = module("testkit", CrossType.Pure)
.dependsOn(macrosM, platformM)
.settings(typelevel.macroCompatSettings(vAll):_*)
.configure(disableScoverage210Js)
.configureCross(disableScoverage210Js)
.settings(fix2_12:_*)

/**
Expand All @@ -151,7 +151,7 @@ lazy val specliteM = module("speclite", CrossType.Pure)
.jvmSettings(libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0")
.jvmSettings(libraryDependencies += "org.scala-js" %% "scalajs-stubs" % scalaJSVersion)
.jsSettings( libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion)
.configure(disableScoverage210Jvm)
.configureCross(disableScoverage210Jvm)

/*
* Tests - cross project that defines test utilities that can be re-used in other libraries, as well as
Expand Down Expand Up @@ -209,7 +209,7 @@ lazy val scoverageSettings = sharedScoverageSettings(60) ++ Seq(
def localSharedBuildSettings(gh: GitHubSettings, v: Versions) = Seq(
organization := gh.publishOrg,
scalaVersion := v.vers("scalac"),
crossScalaVersions := Seq(v.vers("scalac_2.10"), "2.12.0-RC1", scalaVersion.value)
crossScalaVersions := Seq(v.vers("scalac_2.10"), "2.12.0-RC2", scalaVersion.value)
)

val cmdlineProfile = sys.props.getOrElse("sbt.profile", default = "")
Expand Down
6 changes: 3 additions & 3 deletions project/CatalystsDeps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ object Dependencies {
// Package -> version
val versions = Map[String, String](
// "macro-compat" -> "1.0.44"
"discipline" -> "0.7",
"scalacheck" -> "1.13.2",
"discipline" -> "0.7.1",
"scalacheck" -> "1.13.3",
"scalatest" -> "3.0.0",
"specs2" -> "3.8.5"
"specs2" -> "3.8.5.1"
)

// library definitions and links to their versions
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.12
sbt.version=0.13.13-RC3
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.typelevel" % "sbt-catalysts" % "0.1.12")

// override for now until sbt-catalysts is updated
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC1")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0-RC2")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.4.5")

0 comments on commit 9f29076

Please sign in to comment.