Skip to content

Commit

Permalink
Update configs
Browse files Browse the repository at this point in the history
  • Loading branch information
WojciechMazur committed Aug 16, 2024
1 parent 151e5aa commit c110d56
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 4 deletions.
71 changes: 70 additions & 1 deletion coordinator/configs/projects-config.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"io.7mind.izumi%idealingua-v1-runtime-rpc-go",
"io.7mind.izumi%idealingua-v1-model"
]
sbt.options = ["-Dizumi.distage.plancheck.only-warn=true"]
}

absaoss_absa-shaded-jackson-module-scala.tests = disabled # Does not compile in any version
Expand Down Expand Up @@ -75,6 +76,9 @@ apache_pekko-http {
apache_pekko-connectors{
java.version = 8 // for scaladoc
}
arainko_ducktape {
source-version = 3.3
}
armanbilge_litter.sbt.commands = ["set every Test/classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat"]
armanbilge_feral.projects.exclude = [
// Not present in the repo
Expand Down Expand Up @@ -161,6 +165,17 @@ cheleb_zio-pravega {
"removeScalacOptionsStartingWith -P:wartremover"
]
}
circe_circe {
source-patches = [{
path = "modules/core/shared/src/main/scala-3/io/circe/derivation/ConfiguredDecoder.scala"
pattern = "case cd: ConfiguredDecoder[?] with SumOrProduct"
replace-with = "case cd: (ConfiguredDecoder[?] & SumOrProduct)"
},{
path = "modules/core/shared/src/main/scala-3/io/circe/derivation/ConfiguredEncoder.scala"
pattern = "case ce: ConfiguredEncoder[?] with SumOrProduct"
replace-with = "case ce: (ConfiguredEncoder[?] & SumOrProduct)"
}]
}
coralogix_zio-k8s{
java.version = 17
projects.overrides {
Expand Down Expand Up @@ -830,6 +845,10 @@ paulbutcher_scalamock {
path = "jvm/src/test/scala/com.paulbutcher.test/mock/JavaMocksTest.scala"
pattern = "m.simplePolymorphicMethod _"
replace-with = "m.simplePolymorphicMethod[Int] _"
},{
path = "shared/src/main/scala/org/scalamock/MockFactoryBase.scala"
pattern = "callLog foreach expectationContext.verify _"
replace-with = "callLog.foreach(expectationContext.verify(_))"
}]
}
pureharm_pureharm-db-core{
Expand Down Expand Up @@ -879,7 +898,49 @@ sageserpent-open_kineticmerge{
pattern = "@tailrec"
replace-with = ""
}]

}
sagifogel_proptics{
# All of this source:3.4 patches are workaround for https://github.com/scala/scala3/issues/21394
source-patches = [{
path = "core/shared/src/main/scala/proptics/Grate.scala"
pattern = "Grate_[F[A], F[B], A, B](cotraverse(_: (F[A] => A) => B)(identity[F[A]])(Functor[F[A] => *]))"
replace-with = "Grate_[F[A], F[B], A, B](cotraverse(_: (F[A] => A) => B)(identity[F[A]])(using Functor[F[A] => *]))"
},{
path = "core/shared/src/main/scala/proptics/data/Dual.scala"
pattern = "def combine(x: Dual[A], y: Dual[A]): Dual[A] = semigroupDual(ev)"
replace-with = "def combine(x: Dual[A], y: Dual[A]): Dual[A] = semigroupDual(using ev)"
},{
path = "law/src/main/scala/proptics/law/discipline/WanderTests.scala"
pattern = "ChoiceTests(wander).choice[A, B, C, D, E, G].props ++ StrongTests(wander).strong"
replace-with = "ChoiceTests(using wander).choice[A, B, C, D, E, G].props ++ StrongTests(using wander).strong"
},{
path = "test/shared/src/test/scala/proptics/specs/ZippingSpec.scala"
pattern = "ProfunctorTests[Zipping](profunctorZipping)"
replace-with = "ProfunctorTests[Zipping](using profunctorZipping)"
},{
path = "test/shared/src/test/scala/proptics/specs/TaggedSpec.scala"
pattern = "ProfunctorTests[Tagged](Tagged.profunctorTagged)"
replace-with = "ProfunctorTests[Tagged](using Tagged.profunctorTagged)"
},{
path = "test/shared/src/test/scala/proptics/specs/StallSpec.scala"
pattern = "ProfunctorTests[Stall[Int, Int, *, *]](profunctorStall)"
replace-with = "ProfunctorTests[Stall[Int, Int, *, *]](using profunctorStall)"
},{
path = "test/shared/src/test/scala/proptics/specs/ForgetSpec.scala"
pattern = "Tests[Forget[Int, *, *]](Forget."
replace-with = "Tests[Forget[Int, *, *]](using Forget."
},{
path = "test/shared/src/test/scala/proptics/specs/GrateSpec.scala"
pattern = "zipWithF[Id](identity)(_.part)(Applicative[Id])"
replace-with = "zipWithF[Id](identity)(_.part)(using Applicative[Id])"
}]
}
sangria-graphql_sangria{
source-patches = [{
path = "modules/core/src/main/scala/sangria/introspection/package.scala"
pattern = "case n: Type with Named =>"
replace-with = "case n: (Type & Named) =>"
}]
}
scala-cli_libdaemon-jvm {
java.version=17
Expand Down Expand Up @@ -1210,6 +1271,14 @@ zio_zio-protoquill {
sbt.commands=[
"set every Test/classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat"
]
source-patches = [
{
path = "quill-sql/src/main/scala/io/getquill/generic/ElaborateStructure.scala"
pattern = "case Some((3, 3))"
replace-with = "case Some((3, _))"
}
]

}
zio_zio-quill {
sbt.options=["-Dquill.scala.version=<SCALA_VERSION>"]
Expand Down
11 changes: 11 additions & 0 deletions coordinator/configs/require/migration/3.4.2
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
47degrees/github4s
apache/pekko-connectors
atnos-org/eff
blackdoor/jose
chrisnappin/play-recaptcha
circe/circe
circe/circe-golden
com-lihaoyi/cask
com-lihaoyi/upickle
Expand All @@ -19,16 +21,25 @@ geirolz/advxml
hughsimpson/scalameter
jodersky/applib
kalin-rudnicki/harness
lloydmeta/enumeratum
msgpack4z/msgpack4z-core
paulbutcher/scalamock
phenoscape/scowl
playframework/play-silhouette
polyvariant/smithy4s-caliban
ruippeixotog/scala-scraper
sangria-graphql/sangria
scalameta/metaconfig
scalapb-json/scalapb-argonaut
scalapb-json/scalapb-json-common
shuwariafrica/version
softwaremill/tapir
torrentdam/bittorrent
tpolecat/doobie
travisbrown/dhallj
xuwei-k/optparse-applicative
yakivy/poppet
zio/interop-cats
zio/zio-dynamodb
zio/zio-protoquill
zio/zio-schema
7 changes: 4 additions & 3 deletions coordinator/configs/require/migration/3.5.0
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
akka/akka-http
apache/pekko-grpc
apache/pekko-management
ghostdogpr/caliban
laserdisc-io/tamer
rustedbones/pekko-http-metrics
tminglei/slick-pg
typelevel/otel4s-experimental
sirthias/borer

tminglei/slick-pg
typelevel/otel4s-experimental

0 comments on commit c110d56

Please sign in to comment.