Skip to content

Commit 322641a

Browse files
SethTisueSethTisue
authored
2.13: unfreeze or unfork a ton of projects (#1478)
1 parent 46be896 commit 322641a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+98
-309
lines changed

‎community.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ include "proj/macwire.conf"
262262
include "proj/magnolia.conf"
263263
include "proj/mainargs.conf"
264264
include "proj/mdoc.conf"
265-
include "proj/mercator.conf"
266265
include "proj/metaconfig.conf"
267266
include "proj/metrics-scala.conf"
268267
include "proj/mima.conf"

‎proj/acyclic.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// https://github.com/scalacommunitybuild/acyclic.git#community-build-2.13 # was master
22

3-
// forked for 2.13.2 compatibility (also had to add an sbt build)
3+
// forked for 2.13.2 compatibility and to add an sbt build;
4+
// fork refreshed August 2021
45

56
vars.proj.acyclic: ${vars.base} {
67
name: "acyclic"
78
uri: "https://github.com/scalacommunitybuild/acyclic.git#2e722a0ae253d4c7be31169e8f2397f50d5d876f"
89

910
extra.projects: ["acyclic"]
10-
// TODO reenable tests
11+
// we might try to get this working at some point
1112
extra.test-tasks: ["compile"]
1213
}

‎proj/akka-http.conf

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
// https://github.com/scalacommunitybuild/akka-http.git#community-build-2.13 # was akka, release-10.1 branch
2-
3-
// according to Patrik at https://github.com/akka/akka/issues/29340#issuecomment-677529298 ,
4-
// Play won't move to akka-http 10.2.x until Play 2.9.x
5-
6-
// forked (July, August 2020) for ScalaTest 3.2 compatibility
7-
// fork updated (September 2020) for sbt 1.4 friendliness
8-
// fork updated (November 2020) for ScalaCheck 1.14->1.15 bump
9-
// fork refreshed (January 2021)
10-
// (March 2021) cherry-picked https://github.com/akka/akka-http/pull/3558 so tests pass on MacOS locally
11-
12-
// if/when unfork time comes, note the discussion on https://github.com/akka/akka-http/pull/3701
13-
// (which was not merged) about ScalaTest and ScalaCheck upgrades.
1+
// https://github.com/akka/akka-http.git#master
142

153
vars.proj.akka-http: ${vars.base} {
164
name: "akka-http"

‎proj/akka-management.conf

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
// https://github.com/akka/akka-management.git#12a6933b1f30a93566d8ba055d96b1137e521c8d # was master
2-
3-
// dependency of lagom
4-
5-
// frozen (May 2021) at known-green commit before an upgrade to akka-http 10.2
6-
// (we are still on 10.1)
1+
// https://github.com/akka/akka-management.git#master
72

83
vars.proj.akka-management: ${vars.base} {
94
name: "akka-management"
10-
uri: "https://github.com/akka/akka-management.git#12a6933b1f30a93566d8ba055d96b1137e521c8d"
5+
uri: "https://github.com/akka/akka-management.git#5557e2c3de229efca86451187949b8687b9059b6"
116

127
// for now anyway, ambition level is just to include anything lagom needs
138
extra.projects: ["akka-management", "cluster-bootstrap", "cluster-http"]

‎proj/akka-persistence-jdbc.conf

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
1-
// https://github.com/scalacommunitybuild/akka-persistence-jdbc.git#community-build-2.13 # was dnvriend, a3a4cbb
2-
3-
// frozen (December 2019) at a December 2019 commit a bit before the
4-
// organization changed to com.typesafe.akka. once the lagom repo
5-
// updates their dependency to use the new org, we could probably
6-
// unfreeze
7-
8-
// and then forked from that commit to upgrade to ScalaTest 3.1
9-
// (because the usual way of overriding the dependency ran into
10-
// trouble; see https://github.com/scala/community-build/issues/1072)
11-
// (fork updated July 2020 for ScalaTest 3.2)
1+
// https://github.com/akka/akka-persistence-jdbc.git#master
122

133
vars.proj.akka-persistence-jdbc: ${vars.base} {
144
name: "akka-persistence-jdbc"
15-
uri: "https://github.com/scalacommunitybuild/akka-persistence-jdbc.git#b48a78c99b3d11adcc7fa8c5783bf87bed0b3b27"
5+
uri: "https://github.com/akka/akka-persistence-jdbc.git#bef97bfbe3520c3160caf52176c2529400e1826f"
166

177
// it isn't clear to me that there are any tests we can run without
188
// doing the Docker stuff in their test.sh script. we might ask the
199
// Akka team if there is any segregation between unit vs. integration tests,
2010
// that kind of thing?
2111
extra.test-tasks: "compile"
22-
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
23-
extra.commands: ${vars.default-commands} [
24-
"set every bintrayReleaseOnPublish := false"
25-
]
2612
}

‎proj/blaze.conf

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
// https://github.com/scalacommunitybuild/blaze.git#community-build-2.13 # was http4s, v0.14.10
2-
3-
// frozen (January 2020) at v0.14.10 tag since that's the version http4s wants
4-
// forked (March 2021) from that tag to adapt to scala/scala#9525
1+
// https://github.com/http4s/blaze.git#main
52

63
vars.proj.blaze: ${vars.base} {
74
name: "blaze"
8-
uri: "https://github.com/scalacommunitybuild/blaze.git#12a0e804c862f5caa6795cd9a79144173a566052"
5+
uri: "https://github.com/http4s/blaze.git#a973de5f035e922e2631747c277d15307c1e9a68"
96

107
extra.commands: ${vars.default-commands} [
8+
"set every gpgWarnOnFailure := true"
119
// fails on JDK 11 only: https://github.com/http4s/blaze/issues/376
1210
"""set core / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "SSLStageSpec.scala""""
1311
]

‎proj/cachecontrol.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// https://github.com/playframework/cachecontrol.git#v2.0.0-M2
2-
3-
// Nov 2019: use exact version play-ws expects
1+
// https://github.com/playframework/cachecontrol.git#main
42

53
vars.proj.cachecontrol: ${vars.base} {
64
name: "cachecontrol"
7-
uri: "https://github.com/playframework/cachecontrol.git#aea2d269556d3b6e484bc8c815757a5f65ae6079"
5+
uri: "https://github.com/playframework/cachecontrol.git#ccae72a5325fe897a5e495e74b596cb01f92a91a"
86

97
}

‎proj/case-app.conf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
// https://github.com/alexarchambault/case-app.git#930e790148f8cc1a12781f18ffa343f9c349422a # was master
2-
3-
// frozen (February 2020) before this started:
4-
// io.github.alexarchambault#data-class is not provided
5-
// presumably we could add that repo. not going there at the moment
1+
// https://github.com/alexarchambault/case-app.git#master
62

73
vars.proj.case-app: ${vars.base} {
84
name: "case-app"
9-
uri: "https://github.com/alexarchambault/case-app.git#930e790148f8cc1a12781f18ffa343f9c349422a"
5+
uri: "https://github.com/alexarchambault/case-app.git#3484a8ad9cff6df8c2cf6c61d0a714423b19a0fb"
106

117
// this is enough for scalafix, I didn't even try adding the rest
128
extra.projects: ["coreJVM"]

‎proj/cats-effect.conf

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
1-
// https://github.com/typelevel/cats-effect.git#series/2.x
2-
3-
// Note that we are on Cats Effect 2 (series/2.x).
4-
// Cats Effect 3 is the new hotness. We didn't upgrade right away,
5-
// because we were waiting for downstream repos to upgrade, but
6-
// enough time has now passed (August 2021) that switching to 3
7-
// is plausible. This would allow unfreezing a bunch of downstream
8-
// repos, many of which have a comment in their .conf files
9-
// (`git grep CE` and `git grep -i cats.effect` will find most or
10-
// all of those comments).
11-
12-
// Regardless: the whole picture will change once #1456 ("radically simplify
13-
// the build") goes through. Once we no longer have a monorepo-style
14-
// build, it will be easy to switch to CE3 (and even keep CE2 as well, if we
15-
// want).
1+
// https://github.com/typelevel/cats-effect.git#series/3.x
162

173
vars.proj.cats-effect: ${vars.base} {
184
name: "cats-effect"
19-
uri: "https://github.com/typelevel/cats-effect.git#8b1c9767ced1701791fd7eda48c8a8b997090e6d"
5+
uri: "https://github.com/typelevel/cats-effect.git#337ad3770c3dc974b900de1b52d3d3f12245108f"
206

21-
extra.projects: ["coreJVM", "lawsJVM"] // no Scala.js plz
7+
extra.exclude: ["*JS", "benchmarks", "docs", "webWorkerTests"]
228
extra.commands: ${vars.default-commands} [
239
// otherwise sbt-gpg errors on `publish`
2410
"set every gpgWarnOnFailure := true"

‎proj/cats-mtl.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
// https://github.com/typelevel/cats-mtl.git#master
22

3-
// dependency of pfps-shopping-cart (via meow-mtl)
4-
5-
// note that (as of July 2021 anyway) we no longer have either pfps-shopping-cart
6-
// or meow-mtl in the build. I briefly tried re-adding them at
7-
// https://github.com/scala/community-build/pull/1451 but got bogged down
8-
93
vars.proj.cats-mtl: ${vars.base} {
104
name: "cats-mtl"
115
uri: "https://github.com/typelevel/cats-mtl.git#48df3738b60be719c600c2515ac80655500f2195"

‎proj/cats.conf

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
1-
// https://github.com/typelevel/cats.git#v2.6.1
1+
// https://github.com/typelevel/cats.git#main
22

33
vars.proj.cats: ${vars.base} {
44
name: "cats"
5-
uri: "https://github.com/typelevel/cats.git#2473fcb713a08c42bd9b5a47f35df109916d62d0"
5+
uri: "https://github.com/typelevel/cats.git#84ce2570aafd901912fe539f1d0c4697a83b3551"
66

7-
// for some reason, adding the umbrella "catsJVM" project but excluding "bench"
8-
// (and "docs") doesn't succeed in removing the depending on cats-bench.
9-
// using deps.ignore doesn't fix it either. not sure how else to fix it
10-
// other than just enumerating what we want:
11-
extra.projects: [
12-
"coreJVM", "freeJVM", "kernelJVM",
13-
"lawsJVM", "testkitJVM", "testsJVM",
14-
"kernelLawsJVM", "alleycatsCoreJVM"
15-
]
16-
extra.exclude: [
17-
// out of scope
18-
"bench", "docs"
19-
]
7+
extra.exclude: ["bench", "docs", "*JS", "*Native", "js", "binCompatTest", "native", "cats"]
208
// tests are memory-hungry. hard to tell if occasional OutOfMemoryErrors are because
219
// some random test input in a generative test hit a real bug, or whether memory needs
2210
// just fluctuate :-/ I've been gradually increasing this trying to fix an OOM in

‎proj/circe-config.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
// https://github.com/circe/circe-config.git#master
22

3-
// added because it's a dependency of scala-pet-store
4-
53
vars.proj.circe-config: ${vars.base} {
64
name: "circe-config"
75
uri: "https://github.com/circe/circe-config.git#094ed48a2e296b188f126f58837c46f930e44016"
86

9-
extra.commands: ${vars.default-commands} [
10-
"""set every doctestScalaTestVersion := Some("3.2.1")"""
11-
// ScalaCheck 1.15 not 1.14
12-
"removeDependency org.scalatestplus scalacheck-1-14"
13-
"""set ThisBuild / libraryDependencies += "org.scalatestplus" %% "scalacheck-1-15" % "0" % Test"""
14-
]
15-
deps.inject: ${vars.base.deps.inject} ["org.scalatestplus#scalacheck-1-15"]
167
}

‎proj/ciris.conf

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
// https://github.com/vlovgr/ciris.git#ddb8a5a8b40398ce59f249c340703f85a023e5fd # was master
2-
3-
// dependency of pfps-shopping-cart
4-
5-
// frozen (March 2021) at known-green commit before move to CE3
1+
// https://github.com/vlovgr/ciris.git#master
62

73
vars.proj.ciris: ${vars.base} {
84
name: "ciris"
9-
uri: "https://github.com/vlovgr/ciris.git#ddb8a5a8b40398ce59f249c340703f85a023e5fd"
5+
uri: "https://github.com/vlovgr/ciris.git#c08069d62711fa56299e96705d915cefee335907"
106

117
extra.exclude: ["docs"]
128
}

‎proj/classutil.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/bmc/classutil.git#master
22

3-
// dependency of giter8
4-
53
vars.proj.classutil: ${vars.base} {
64
name: "classutil"
75
uri: "https://github.com/bmc/classutil.git#42899a54333d13aebf591e694ab22926659d8eb0"

‎proj/decline.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/bkirwi/decline.git#master
22

3-
// core doesn't depend on refined, but refinedJVM does.
4-
53
vars.proj.decline: ${vars.base} {
64
name: "decline"
75
uri: "https://github.com/bkirwi/decline.git#f68f5b337e9787b31cee07f8f3395d082eb1cb9c"

‎proj/doobie.conf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// https://github.com/tpolecat/doobie.git#v0.9.4
1+
// https://github.com/SethTisue/doobie.git#no-sbt-dotty # was tpolecat, master
22

3-
// dependency of scala-pet-store
3+
// temporarily forked pending merge of
4+
// https://github.com/tpolecat/doobie/pull/1530
45

56
vars.proj.doobie: ${vars.base} {
67
name: "doobie"
7-
uri: "https://github.com/tpolecat/doobie.git#95578b21fec6b4e7429eadb2be25b48451b65700"
8+
uri: "https://github.com/SethTisue/doobie.git#5272ecdd16d9c30a30a45ee80589df96260e108c"
89

910
extra.options: ["-Xss16m"] // prevent stack overflow when compiling build definition
1011
extra.exclude: [

‎proj/droste.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/higherkindness/droste.git#main
22

3-
// depends on atto
4-
53
vars.proj.droste: ${vars.base} {
64
name: "droste"
75
uri: "https://github.com/higherkindness/droste.git#61af443cf7fec77783876bd73e07748eb48e9038"

‎proj/eff.conf

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
// https://github.com/atnos-org/eff.git#466658c801545f870a2de48f5bd263eef3c88b1a # was master
2-
3-
// frozen (September 2020) at a known-green commit just before a cats 2.2.0 upgrade
1+
// https://github.com/atnos-org/eff.git#master
42

53
vars.proj.eff: ${vars.base} {
64
name: "eff"
7-
uri: "https://github.com/atnos-org/eff.git#466658c801545f870a2de48f5bd263eef3c88b1a"
5+
uri: "https://github.com/atnos-org/eff.git#8013c00f13e38d51a186e457df545baf0c5e52d4"
86

9-
extra.exclude: [
10-
"scalazJVM", "*JS"
11-
// this is an aggregation project that we exclude because it adds a
12-
// ScalaMeter dependency
13-
"eff"
14-
// we don't have catbird
15-
"twitter"
16-
]
7+
extra.exclude: ["scalazJVM", "*JS", "*Native"]
178
}

‎proj/expecty.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/eed3si9n/expecty.git#develop
22

3-
// dependency of scopt
4-
53
vars.proj.expecty: ${vars.base} {
64
name: "expecty"
75
uri: "https://github.com/eed3si9n/expecty.git#a280f8a814cd46927ff4b792b63e4653538d4cf0"

‎proj/expression-evaluator.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/plokhotnyuk/expression-evaluator.git#master
22

3-
// compile-time only dependency of jsoniter-scala
4-
53
vars.proj.expression-evaluator: ${vars.base} {
64
name: "expression-evaluator"
75
uri: "https://github.com/plokhotnyuk/expression-evaluator.git#fd05508559e1d364f7d1a6146739aebd7b11e097"

‎proj/finagle.conf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
// https://github.com/twitter/finagle.git#e3fd6d1bd88c9ed7edeb98a6598e23800924c633 # was master
1+
// https://github.com/twitter/finagle.git#finagle-21.8.0
22

3-
// frozen (April 2020) at a March 2020 commit before the build
4-
// moved to com.twitter#scrooge-generator version 20.4.0;
5-
// for now anyway, 20.3.0 is the most recent version on Maven Central
3+
// August 2021: tried using `develop` but a SNAPSHOT dependency wasn't
4+
// found, so trying a tag
65

76
vars.proj.finagle: ${vars.base} {
87
name: "finagle"
9-
uri: "https://github.com/twitter/finagle.git#e3fd6d1bd88c9ed7edeb98a6598e23800924c633"
8+
uri: "https://github.com/twitter/finagle.git#d5598250c965c1bcb020001aa7ad45727fe82e75"
109

1110
// I didn't attempt to add any other subprojects
1211
extra.projects: ["finagle-core", "finagle-http"]

‎proj/fs2-chat.conf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// https://github.com/typelevel/fs2-chat.git#cb8470c1baf62c2fdb4b81be010a3b965d1c8c3c
2-
3-
// frozen (December 2020) at the last commit (July 2020) before an upgrade
4-
// to fs2 3.x
1+
// https://github.com/typelevel/fs2-chat.git#master
52

63
vars.proj.fs2-chat: ${vars.base} {
74
name: "fs2-chat"
8-
uri: "https://github.com/typelevel/fs2-chat.git#cb8470c1baf62c2fdb4b81be010a3b965d1c8c3c"
5+
uri: "https://github.com/typelevel/fs2-chat.git#eeadce2abc760009a8bb5ebc5b66251fb25d77c6"
96

107
}

‎proj/github4s.conf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
// https://github.com/47deg/github4s.git#9e8c7bb30d1880274a5df18c374c99f605854d81 # was main
2-
3-
// frozen (July 2021) at known-green commit before CE3 upgrade
1+
// https://github.com/47deg/github4s.git#main
42

53
vars.proj.github4s: ${vars.base} {
64
name: "github4s"
7-
uri: "https://github.com/47deg/github4s.git#9e8c7bb30d1880274a5df18c374c99f605854d81"
5+
uri: "https://github.com/47deg/github4s.git#25028113c16513236e0b36999e38b8d811cb67ea"
86

97
extra.sbt-version: "1.5.2" // until they're on new enough sbt-scoverage
108
extra.projects: ["github4s"]

‎proj/http4s-jwt-auth.conf

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
1-
// https://github.com/profunktor/http4s-jwt-auth.git#95729217dce5aa4aeac8eabf8b676f540184923d # was master
2-
3-
// dependency of pfps-shopping-cart
4-
5-
// frozen (March 2021) at a known-green commit before this happened:
6-
// Missing dependency: the library com.github.jwt-scala#jwt-core
7-
// I didn't investigate, since we have this repo primarily just because
8-
// we need it for pfps-shopping-cart, so I'm fine with a frozen version
1+
// https://github.com/profunktor/http4s-jwt-auth.git#master
92

103
vars.proj.http4s-jwt-auth: ${vars.base} {
114
name: "http4s-jwt-auth"
12-
uri: "https://github.com/profunktor/http4s-jwt-auth.git#95729217dce5aa4aeac8eabf8b676f540184923d"
5+
uri: "https://github.com/profunktor/http4s-jwt-auth.git#4dbee3b4d92b3a1f6867ccf85283436b8ae7a025"
136

147
extra.projects: ["core"]
158
extra.commands: ${vars.default-commands} [

‎proj/http4s-parboiled2.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// https://github.com/http4s/parboiled2.git#master
22

3-
// dependency of http4s (it's their fork of parboiled2)
4-
53
vars.proj.http4s-parboiled2: ${vars.base} {
64
name: "http4s-parboiled2"
75
uri: "https://github.com/http4s/parboiled2.git#d9844f2ca8df4de6baae95ac0a2617601f4469cf"

‎proj/jawn-fs2.conf

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
// https://github.com/typelevel/jawn-fs2.git#751bc6b44abf2408b9ee286ff808325084ebfd73 # was main
2-
3-
// frozen (October 2020) at a known-green commit. cats-effect related compile error
4-
// on newer commit
1+
// https://github.com/typelevel/jawn-fs2.git#main
52

63
vars.proj.jawn-fs2: ${vars.base} {
74
name: "jawn-fs2"
8-
uri: "https://github.com/typelevel/jawn-fs2.git#751bc6b44abf2408b9ee286ff808325084ebfd73"
5+
uri: "https://github.com/typelevel/jawn-fs2.git#8972efa33c0ee955f52da0b33543ee0a8079baeb"
96

7+
extra.exclude: ["*JS"]
8+
extra.commands: ${vars.default-commands} [
9+
"set every gpgWarnOnFailure := true"
10+
]
1011
}

0 commit comments

Comments
 (0)