Merge pull request #32 from TimothyKlim/master

Cats 1.0.0-MF
RMSone · Aug 22, 2017 · 39f5f69 · 39f5f69
2 parents ac454ae + 400fc01
commit 39f5f69
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ Because of possible binary incompatibilities here are the dependency versions us
 |         0.5-M2     |     3.2.0-M2  |     0.9.x    |
 |         0.5        |     3.2.0     |     0.9.x    |
 |         0.6        |     3.2.0     |     0.9.x    |
+|         0.7-MF     |     3.2.1     |     1.0.0-MF |
 
 Artifacts are publicly available on Maven Central starting from version *0.6*.
 

diff --git a/build.sbt b/build.sbt
@@ -2,8 +2,8 @@ organization := "com.rms.miu"
 name := "slick-cats"
 description := "cats and slick"
 
-scalaVersion := "2.12.2"
-crossScalaVersions := Seq("2.11.11", "2.12.2")
+scalaVersion := "2.12.3"
+crossScalaVersions := Seq("2.11.11", "2.12.3")
 
 scalacOptions ++= Seq(
   "-deprecation",
@@ -23,9 +23,10 @@ scalacOptions ++= Seq(
 )
 
 libraryDependencies ++= Seq(
-  "org.typelevel" %% "cats" % "0.9.0",
-  "com.typesafe.slick" %% "slick" % "3.2.0",
-  "org.scalatest" %% "scalatest" % "3.0.3" % Test,
+  "org.typelevel" %% "cats-core" % "1.0.0-MF",
+  "org.typelevel" %% "cats-laws" % "1.0.0-MF",
+  "com.typesafe.slick" %% "slick" % "3.2.1",
+  "org.scalatest" %% "scalatest" % "3.0.4" % Test,
   "org.scalacheck" %% "scalacheck" % "1.13.5" % Test
 )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=0.13.16
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC3")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC10")
 addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
diff --git a/src/main/tut/README.md b/src/main/tut/README.md
@@ -32,6 +32,7 @@ Because of possible binary incompatibilities here are the dependency versions us
 |         0.5-M2     |     3.2.0-M2  |     0.9.x    |
 |         0.5        |     3.2.0     |     0.9.x    |
 |         0.6        |     3.2.0     |     0.9.x    |
+|         0.7-MF     |     3.2.1     |     1.0.0-MF |
 
 Artifacts are publicly available on Maven Central starting from version *0.6*.
 

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.6"
+version in ThisBuild := "0.7-MF"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.6"
		version in ThisBuild := "0.7-MF"