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.

Sign up for GitHub

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

Jump to bottom

WIP: Support for fs2.Task dropping own Catchable #323

Merged
merged 10 commits into from
Sep 6, 2016
Merged

WIP: Support for fs2.Task dropping own Catchable #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
849142f
Support fs2.util.{Catchable, Task} dropping own Catchable
guersam Aug 12, 2016
f517b8f
Make FreeGen emits ctors in more consistent order
guersam Aug 12, 2016
4ffb5b9
WIP: Effect everywhere
guersam Aug 15, 2016
db4cb4e
Remove unnecessary Monad import in free
guersam Aug 15, 2016
91d9f93
Replace cats constraints with fs2-cats conversions
guersam Aug 15, 2016
85b0a27
Some cleanup
guersam Aug 15, 2016
19e77c7
Update to fs2 0.9.0-RC2 and cats 0.7.0
guersam Aug 23, 2016
f030e43
Rename generated low-priority typeclass holders
guersam Aug 23, 2016
fb8d5ad
Drop unnecessary fs2 Catchable constraints
guersam Aug 23, 2016
fc6b016
Update to cats 0.7.2
guersam Sep 5, 2016
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
22 changes: 13 additions & 9 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,19 @@ lazy val core = project.in(file("modules/core"))
scalazCrossSettings
)

val catsVersion = "0.7.2"
lazy val core_cats = project.in(file("modules-cats/core"))
.enablePlugins(SbtOsgi)
.settings(
yax(file("yax/core"), "cats", "fs2"),
coreSettings("core-cats"),
libraryDependencies ++= Seq(
"org.typelevel" %% "cats" % "0.6.1",
"co.fs2" %% "fs2-core" % "0.9.0-RC1",
"com.h2database" % "h2" % "1.3.170" % "test"
"co.fs2" %% "fs2-core" % "0.9.0-RC2",
"co.fs2" %% "fs2-cats" % "0.1.0-RC2",
"org.typelevel" %% "cats-core" % catsVersion,
"org.typelevel" %% "cats-free" % catsVersion,
"org.typelevel" %% "cats-laws" % catsVersion % "test",
"com.h2database" % "h2" % "1.3.170" % "test"
)
)

Expand All @@ -236,7 +240,7 @@ lazy val example = project.in(file("modules/example"))

lazy val example_cats = project.in(file("modules-cats/example"))
.settings(doobieSettings ++ noPublishSettings)
.settings(yax(file("yax/example"), "cats"))
.settings(yax(file("yax/example"), "cats", "fs2"))
.dependsOn(core_cats, postgres_cats, specs2_cats, hikari_cats, h2_cats)

///
Expand Down Expand Up @@ -275,7 +279,7 @@ lazy val postgres = project.in(file("modules/postgres"))
lazy val postgres_cats = project.in(file("modules-cats/postgres"))
.enablePlugins(SbtOsgi)
.settings(
yax(file("yax/postgres"), "cats"),
yax(file("yax/postgres"), "cats", "fs2"),
postgresSettings("postgres-cats")
)
.dependsOn(core_cats)
Expand Down Expand Up @@ -304,7 +308,7 @@ lazy val h2 = project.in(file("modules/h2"))
lazy val h2_cats = project.in(file("modules-cats/h2"))
.enablePlugins(SbtOsgi)
.settings(
yax(file("yax/h2"), "cats"),
yax(file("yax/h2"), "cats", "fs2"),
h2Settings("h2-cats")
)
.dependsOn(core_cats)
Expand Down Expand Up @@ -333,7 +337,7 @@ lazy val hikari = project.in(file("modules/hikari"))
lazy val hikari_cats = project.in(file("modules-cats/hikari"))
.enablePlugins(SbtOsgi)
.settings(
yax(file("yax/hikari"), "cats"),
yax(file("yax/hikari"), "cats", "fs2"),
hikariSettings("hikari-cats")
)
.dependsOn(core_cats)
Expand Down Expand Up @@ -362,7 +366,7 @@ lazy val specs2 = project.in(file("modules/specs2"))
lazy val specs2_cats = project.in(file("modules-cats/specs2"))
.enablePlugins(SbtOsgi)
.settings(
yax(file("yax/specs2"), "cats"),
yax(file("yax/specs2"), "cats", "fs2"),
specs2Settings("specs2")
)
.dependsOn(core_cats)
Expand All @@ -381,7 +385,7 @@ lazy val bench = project.in(file("modules/bench"))

lazy val bench_cats = project.in(file("modules-cats/bench"))
.settings(doobieSettings ++ noPublishSettings)
.settings(yax(file("yax/bench"), "cats"))
.settings(yax(file("yax/bench"), "cats", "fs2"))
.dependsOn(core_cats, postgres_cats)

///
Expand Down
Loading