Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cats to 1.0.0-RC2 #24

Merged
merged 2 commits into from
Dec 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: scala
scala:
- 2.12.1
- 2.11.8
- 2.12.4
- 2.11.12
jdk:
- oraclejdk8
notifications:
Expand All @@ -22,7 +22,7 @@ cache:
before_install:
- export PATH=${PATH}:./vendor/bundle
install:
- rvm use 2.2.3 --install --fuzzy
- rvm use 2.2.8 --install --fuzzy
- gem update --system
- gem install sass
- gem install jekyll -v 3.2.1
Expand Down
21 changes: 9 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import sbtunidoc.Plugin.UnidocKeys._

lazy val buildSettings = Seq(
organization := "com.github.julien-truffaut",
scalaVersion := "2.12.3",
crossScalaVersions := Seq("2.12.3", "2.11.11"),
scalaVersion := "2.12.4",
crossScalaVersions := Seq("2.12.4", "2.11.12"),
scalacOptions ++= Seq(
"-deprecation",
"-encoding", "UTF-8",
Expand All @@ -20,10 +20,7 @@ lazy val buildSettings = Seq(
"-Ywarn-dead-code",
"-Ywarn-value-discard",
"-Xfuture"
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 10)) => Seq("-Yno-generic-signatures") // no generic signatures for scala 2.10.x, see SI-7932, #571 and #828
case _ => Seq()
}),
),
addCompilerPlugin(kindProjector),
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Expand All @@ -32,13 +29,13 @@ lazy val buildSettings = Seq(
scmInfo := Some(ScmInfo(url("https://github.com/julien-truffaut/newts"), "scm:git:git@github.com:julien-truffaut/newts.git"))
)

lazy val catsVersion = "1.0.0-RC1"
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % catsVersion)
lazy val catsLaws = Def.setting("org.typelevel" %%% "cats-laws" % catsVersion)
lazy val catsVersion = "1.0.0-RC2"
lazy val cats = Def.setting("org.typelevel" %%% "cats-core" % catsVersion)
lazy val catsLaws = Def.setting("org.typelevel" %%% "cats-laws" % catsVersion)

lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.0.1" % "test")
lazy val scalatest = Def.setting("org.scalatest" %%% "scalatest" % "3.0.4" % "test")

lazy val kindProjector = "org.spire-math" % "kind-projector" % "0.9.3" cross CrossVersion.binary
lazy val kindProjector = "org.spire-math" % "kind-projector" % "0.9.5" cross CrossVersion.binary

lazy val tagName = Def.setting(
s"v${if (releaseUseGlobalVersion.value) (version in ThisBuild).value else version.value}")
Expand All @@ -53,7 +50,7 @@ lazy val scalajsSettings = Seq(
val g = "https://raw.githubusercontent.com/julien-truffaut/newts"
s"-P:scalajs:mapSourceURI:$a->$g/$s/"
},
requiresDOM := false,
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck,
"-maxSize", "8",
"-minSuccessfulTests", "50")
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
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.13")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.20")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.4.0")

scalacOptions += "-deprecation"