Skip to content

Commit

Permalink
Merge pull request #79 from milessabin/kailuowang-patch-3
Browse files Browse the repository at this point in the history
update cats and scala
  • Loading branch information
kailuowang authored Jan 1, 2018
2 parents 5ac0d13 + f0b4468 commit 7482663
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: scala

scala:
- 2.12.2
- 2.11.11
- 2.12.4
- 2.11.12


jdk:
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import sbt._

lazy val buildSettings = Seq(
organization := "org.typelevel",
scalaVersion := "2.12.3",
crossScalaVersions := Seq( "2.11.11", scalaVersion.value)
scalaVersion := "2.12.4",
crossScalaVersions := Seq( "2.11.12", scalaVersion.value)
)

val catsVersion = "1.0.0-RC1"
val catsVersion = "1.0.1"

lazy val commonSettings = Seq(
scalacOptions := Seq(
Expand All @@ -27,7 +27,7 @@ lazy val commonSettings = Seq(
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % catsVersion,
"org.typelevel" %% "alleycats-core" % catsVersion,
"com.chuusai" %% "shapeless" % "2.3.2",
"com.chuusai" %% "shapeless" % "2.3.3",
"org.scalatest" %% "scalatest" % "3.0.3" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.5" % "test",
"org.typelevel" %% "cats-laws" % catsVersion % "test",
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.15
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.5")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1" )
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "0.2.2")

0 comments on commit 7482663

Please sign in to comment.