Skip to content

upgrade cats to 1.0 #671

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

Merged
merged 1 commit into from
Jan 24, 2018
Merged

upgrade cats to 1.0 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 19 additions & 76 deletions configs/community.dbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,21 +509,12 @@ build += {
extra.exclude: ["docs"]
}

// forked (August 2017) to remove coursier
${vars.base} {
name: "fs2"
uri: ${vars.uris.fs2-uri}
extra.projects: ["coreJVM", "scodecJVM", "io"] // no Scala.js, no benchmarks or docs
extra.commands: ${vars.default-commands} [
// because of new inferred-Any warnings in 2.12.4 (PR 5990)
"removeScalacOptions -Xfatal-warnings"
]
}

# frozen at September 2017 commit because cats-effect was failing;
# see https://github.com/scala/community-builds/issues/600
# November 2017: unfreeze attempt at https://github.com/scala/community-builds/pull/624
# failed, but we should try again in a month or two, something like that
${vars.base} {
name: "cats"
uri: ${vars.uris.cats-uri}
Expand Down Expand Up @@ -607,27 +598,6 @@ build += {
extra.exclude: ["sbtplugin"]
}

${vars.base} {
name: "spire"
uri: ${vars.uris.spire-uri}
// hopefully avoid intermittent OutOfMemoryErrors during compilation
extra.options: ["-Xmx2560m"]
extra.projects: ["spireJVM"] // no Scala.js please
}

${vars.base} {
name: "breeze"
uri: ${vars.uris.breeze-uri}
extra.sbt-version: ${vars.sbt-1-version}
// spire moved from org.spire to org.typelevel but breeze hasn't
// changed their dependency yet
deps.ignore: ["org.spire-math#spire"]
deps.inject: ${vars.base.deps.inject} [
"org.typelevel#spire"
]
check-missing: false
}

// forked (January 2018) to remove a couple of failing tests; ticket
// is https://github.com/etorreborre/specs2/issues/622. note we are
// using the 3.x branch, even though specs2 4.0 has been out for a while
Expand Down Expand Up @@ -893,27 +863,16 @@ build += {
extra.projects: ["minitestJVM", "lawsJVM"] // no Scala.js
}

// frozen (November 2017) at an October 2017 commit because they moved
// to cats 1.0.0-RC1, which we aren't ready for yet (see
// https://github.com/scala/community-builds/pull/624)
${vars.base} {
name: "monix"
uri: ${vars.uris.monix-uri}
extra.sbt-version: ${vars.sbt-1-version}
// no Scala.js, no benchmarks.
// (but also, perhaps this excludes more stuff than necessary?)
extra.projects: ["coreJVM"]
// because of new inferred-Any warnings in 2.12.4 (PR 5990)
extra.commands: ${vars.default-commands} [
// currently (January 2018) runs afoul of PartialFunction.apply deprecation in 2.12.5
"removeScalacOptions -Xfatal-warnings"
// Failed test: monix.execution.misc.AsyncSemaphoreSuite
// but according to Alexandru at https://github.com/monix/monix/issues/465
// the problem is already fixed on master. So at the time we unfreeze
// we can start running these tests again.
"set executeTests in executionJVM in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
// not investigated or reported -- let's deal with it when we unfreeze:
// monix.eval.TaskSemaphoreSuite
// - real async test of many tasks *** FAILED ***
"set executeTests in evalJVM in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
]
}

Expand Down Expand Up @@ -1019,6 +978,8 @@ build += {
extra.projects: ["pprintJVM"] // no Scala.js
}

// switched (January 2018) to a fork where the cats dependency is upgraded;
// we can unfork once https://github.com/typelevel/algebra/pull/207 lands
${vars.base} {
name: "algebra"
uri: ${vars.uris.algebra-uri}
Expand Down Expand Up @@ -1115,10 +1076,6 @@ build += {
extra.projects: ["lensesJVM"] // no Scala.js plz
}

// adding (September 2017) because scalafix's "cli" subproject uses it.
// forked to modify some version number manipulation code to be
// dbuild-friendly; we can unfork once
// https://github.com/typelevel/paiges/pull/74 is merged
${vars.base} {
name: "paiges"
uri: ${vars.uris.paiges-uri}
Expand All @@ -1138,9 +1095,6 @@ build += {
extra.projects: ["coreJVM"]
}

// frozen (November 2017) at an October 2017 commit, because more
// recent commits require a newer cats, too new for other libraries
// in the community build; see https://github.com/scala/community-builds/pull/624
${vars.base} {
name: "cats-effect"
uri: ${vars.uris.cats-effect-uri}
Expand Down Expand Up @@ -1274,16 +1228,6 @@ build += {
extra.projects: ["jvm"] // no Scala.js or Scala Native plz
}

// OlegYch's fork is the one that hangs out in
// scala/scala (Gitter) and #scala (IRC)
${vars.base} {
name: "multibot"
uri: ${vars.uris.multibot-uri}
// linter isn't essential to the build
deps.ignore: ["org.psywerx.hairyfotr#linter"]
check-missing: false
}

// dependency of scaladex
${vars.base} {
name: "nscala-time"
Expand Down Expand Up @@ -1579,27 +1523,30 @@ build += {
extra.projects: ["ast", "parser", "json4s", "spray"]
}

// frozen (November 2017) at September 2017 commit before they upgraded
// to newer fs2 & cats version; we should be able to unfreeze at the
// same time we unfreeze cats (https://github.com/scala/community-builds/pull/624)
${vars.base} {
name: "jawn-fs2"
uri: ${vars.uris.jawn-fs2-uri}
extra.commands: ${vars.default-commands} [
// too fragile
"removeScalacOptions -Xfatal-warnings"
]
}

// dependency of http4s (it's their fork of parboiled2)
${vars.base} {
name: "http4s-parboiled2"
uri: ${vars.uris.http4s-parboiled2-uri}
extra.projects: ["parboiledJVM"]
}

// well, this is a big build with lots of subprojects, many of which involve
// integration with other libraries. many of them had issues; I didn't
// spend that much time looking into each one and seeing if it might be
// fixable, or ought to be reported upstream, or what.
// we are using an August 2017 commit that has the jawn 0.10->0.11
// upgrade but doesn't have cats 1.0.0-MF->1.0.0-RC1 since we aren't
// (November 2017) ready for that yet (see #624)
// note that if this all proves to be more trouble than it's worth,
// it's fine to drop it for a while until the Typelevel ecosystem
// settles down a bit
${vars.base} {
name: "http4s"
uri: ${vars.uris.http4s-uri}
extra.sbt-version: ${vars.sbt-1-version}
extra.commands: ${vars.default-commands} [
// too fragile
"removeScalacOptions -Xfatal-warnings"
Expand Down Expand Up @@ -1641,9 +1588,9 @@ build += {
]
}

# forked (November 2017) to remove a build.sbt thing that adds Ammonite,
# because it isn't a true dependency and we don't want the complication of
# Ammonite's own dependency tree (in particular, the jawn versions conflict)
# forked (November 2017, refreshed January 2018) to remove a build.sbt thing that
# adds Ammonite, because it isn't a true dependency and we don't want the complication
# of Ammonite's own dependency tree (in particular, the jawn versions conflict)
${vars.base} {
name: "pureconfig"
uri: ${vars.uris.pureconfig-uri}
Expand All @@ -1658,10 +1605,6 @@ build += {
// - Disable fatal Scaladoc warnings, too fragile
"removeScalacOptions -Xfatal-warnings"
]
extra.exclude: [
// didn't compile -- maybe try again after we're on cats 1.0.0-RCx
"cats"
]
}

]}
Expand Down
24 changes: 11 additions & 13 deletions configs/project-refs.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,20 @@ vars.uris: {
akka-http-session-uri: "https://github.com/softwaremill/akka-http-session.git"
akka-more-uri: "https://github.com/akka/akka.git"
akka-persistence-cassandra-uri: "https://github.com/akka/akka-persistence-cassandra.git"
algebra-uri: "https://github.com/typelevel/algebra.git"
algebra-uri: "https://github.com/denisrosset/algebra.git#topic/cats-compatibility" # was typelevel, master
ammonite-uri: "https://github.com/lihaoyi/ammonite.git"
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
atto-uri: "https://github.com/tpolecat/atto.git#series/0.5.x"
autowire-uri: "https://github.com/lihaoyi/autowire.git"
base64-uri: "https://github.com/marklister/base64.git"
better-files-uri: "https://github.com/pathikrit/better-files.git"
blaze-uri: "https://github.com/http4s/blaze.git#release-0.12.x"
breeze-uri: "https://github.com/scalanlp/breeze.git"
cachecontrol-uri: "https://github.com/playframework/cachecontrol.git"
case-app-uri: "https://github.com/scalacommunitybuild/case-app.git#community-build-2.12"
catalysts-uri: "https://github.com/typelevel/catalysts.git"
cats-uri: "https://github.com/typelevel/cats.git#4d9d333c" # was master
cats-effect-uri: "https://github.com/typelevel/cats-effect.git#542290e22" # was master
circe-uri: "https://github.com/scalacommunitybuild/circe.git#community-build-2.12" # was master
cats-uri: "https://github.com/typelevel/cats.git#1.0"
cats-effect-uri: "https://github.com/typelevel/cats-effect.git"
circe-uri: "https://github.com/circe/circe.git"
circe-config-uri: "https://github.com/circe/circe-config.git"
conductr-lib-uri: "https://github.com/typesafehub/conductr-lib.git"
coursier-uri: "https://github.com/coursier/coursier.git"
Expand All @@ -35,15 +34,16 @@ vars.uris: {
elastic4s-uri: "https://github.com/sksamuel/elastic4s.git#release/5.4.x"
fansi-uri: "https://github.com/scalacommunitybuild/fansi.git#community-build-2.12" # was master
fastparse-uri: "https://github.com/lihaoyi/fastparse.git"
fs2-uri: "https://github.com/scalacommunitybuild/fs2.git#community-build-2.12" # was series/0.10
fs2-uri: "https://github.com/functional-streams-for-scala/fs2.git#series/0.10"
genjavadoc-uri: "https://github.com/lightbend/genjavadoc.git"
geny-uri: "https://github.com/lihaoyi/geny.git"
gigahorse-uri: "https://github.com/eed3si9n/gigahorse.git#0.3.x"
github4s-uri: "https://github.com/47deg/github4s.git"
http4s-uri: "https://github.com/scalacommunitybuild/http4s.git#community-build-2.12"
http4s-uri: "https://github.com/http4s/http4s.git"
http4s-parboiled2-uri: "https://github.com/http4s/parboiled2.git"
http4s-websocket-uri: "https://github.com/http4s/http4s-websocket.git"
jackson-module-scala-uri: "https://github.com/FasterXML/jackson-module-scala.git#abacab34f065abda49c4575a8dfb941498c02b3b"
jawn-fs2-uri: "https://github.com/rossabaker/jawn-fs2.git#1ef101b82" # was master
jawn-fs2-uri: "https://github.com/rossabaker/jawn-fs2.git"
jawn-0-10-uri: "https://github.com/non/jawn.git#v0.10.4"
jawn-0-11-uri: "https://github.com/non/jawn.git"
json4s-uri: "https://github.com/json4s/json4s.git#3.5"
Expand All @@ -61,12 +61,11 @@ vars.uris: {
metaconfig-new-uri: "https://github.com/olafurpg/metaconfig.git"
mima-uri: "https://github.com/lightbend/migration-manager.git"
minitest-uri: "https://github.com/monix/minitest.git"
monix-uri: "https://github.com/monix/monix.git#18f91fdf5" # was master
monix-uri: "https://github.com/monix/monix.git"
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"
multibot-uri: "https://github.com/OlegYch/multibot.git"
nscala-time-uri: "https://github.com/nscala-time/nscala-time.git"
nyaya-uri: "https://github.com/japgolly/nyaya.git"
paiges-uri: "https://github.com/scalacommunitybuild/paiges.git#community-build-2.12"
paiges-uri: "https://github.com/typelevel/paiges.git"
paradox-uri: "https://github.com/scalacommunitybuild/paradox.git#community-build-2.12" # was lightbend, master
parboiled-uri: "https://github.com/sirthias/parboiled.git#community-build-2.12"
parboiled2-uri: "https://github.com/sirthias/parboiled2.git#release-2.1"
Expand All @@ -77,7 +76,7 @@ vars.uris: {
play-webgoat-uri: "https://github.com/lightbend/play-webgoat.git"
play-ws-uri: "https://github.com/playframework/play-ws.git"
pprint-uri: "https://github.com/lihaoyi/pprint.git"
pureconfig-uri: "https://github.com/scalacommunitybuild/pureconfig.git#community-build-2.12" # was pureconfig, master
pureconfig-uri: "https://github.com/SethTisue/pureconfig.git#community-build-2.12" # was pureconfig, master
sbinary-uri: "https://github.com/scalacommunitybuild/sbinary.git#community-build-2.12" # was sbt, master
sbt-io-uri: "https://github.com/sbt/io.git#v1.1.3"
sbt-librarymanagement-uri: "https://github.com/sbt/librarymanagement.git#v1.1.2"
Expand Down Expand Up @@ -138,7 +137,6 @@ vars.uris: {
slick-uri: "https://github.com/slick/slick.git"
sourcecode-uri: "https://github.com/lihaoyi/sourcecode.git"
specs2-uri: "https://github.com/scalacommunitybuild/specs2.git#community-build-2.12" # was etorreborre, specs2-3.x
spire-uri: "https://github.com/non/spire.git"
spray-json-uri: "https://github.com/spray/spray-json.git"
ssl-config-uri: "https://github.com/lightbend/ssl-config.git"
tut-uri: "https://github.com/tpolecat/tut.git"
Expand Down