Track typelevel/cats instead of fork - fixes scala#363

adelbertc · Oct 25, 2016 · 4ccd026 · 4ccd026
1 parent 193eb83
commit 4ccd026
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/community.dbuild b/community.dbuild
@@ -411,12 +411,11 @@ build += {
     ]
   }
 
-  // forked because of https://github.com/typelevel/cats/issues/1396
   ${vars.base} {
     name: "cats"
     uri:  ${vars.uris.cats-uri}
     // this is only some of Cats. we should try and add more
-    extra.projects: ["coreJVM", "macrosJVM"] // no Scala.js please
+    extra.projects: ["catsJVM"] // no Scala.js please
     extra.commands: ${vars.default-commands} [
       // too fragile
       "removeScalacOptions -Xfatal-warnings"

diff --git a/project-refs.conf b/project-refs.conf
@@ -7,7 +7,7 @@ vars.uris: {
 //  breeze-uri:                   "https://github.com/scalanlp/breeze.git"
   browse-uri:                   "https://github.com/SethTisue/browse.git#topic/2.12-compat"
   catalysts-uri:                "https://github.com/typelevel/catalysts.git"
-  cats-uri:                     "https://github.com/SethTisue/cats.git#community-build-2.12"
+  cats-uri:                     "https://github.com/typelevel/cats.git"
   discipline-uri:               "https://github.com/typelevel/discipline.git#v0.7"
   fastparse-uri:                "https://github.com/SethTisue/fastparse.git#no-coursier"
   fs2-uri:                      "https://github.com/functional-streams-for-scala/fs2.git#series/0.9"