Skip to content

Commit 1e0e3c9

Browse files
committed
Update configs
1 parent 310ef3d commit 1e0e3c9

File tree

3 files changed

+88
-6
lines changed

3 files changed

+88
-6
lines changed

coordinator/configs/projects-config.conf

Lines changed: 84 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@
5959
# Invalid -rewrite patch
6060
"""set `fundamentals-bio`/Test/unmanagedSources/excludeFilter ~= { _ || "SyntaxTest.scala" }"""
6161
]
62-
62+
}
63+
7mind_sbtgen {
64+
sbt.commands = [
65+
"""mapScalacOptions "-experimental" """
66+
]
67+
tests = compile-only
6368
}
6469

6570
aaronp_args4c{
@@ -76,12 +81,42 @@ ajozwik_protoquill-generic {
7681
tests = compile-only
7782
}
7883
akka_akka-core {
79-
// Based on Scala3 managed community build
80-
sbt.commands = ["set every targetSystemJdk := true"]
84+
// Based on Scala3 managed community build https://github.com/scala/community-build/blob/8ff4813171fec3ae8ffaca1860d4345fad006656/proj/akka.conf
85+
sbt.commands = [
86+
"set every targetSystemJdk := true"
87+
"set every apiURL := None"
88+
"""mapScalacOptions "" -Wconf:cat=unused-nowarn:s,any:e"""
89+
"""set actorTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "BackoffSupervisorSpec.scala" || "MetricsBasedResizerSpec.scala" || "EventStreamSpec.scala" || "ForkJoinPoolStarvationSpec.scala" || "ConfigSpec.scala" || "LineNumberSpec.scala" """
90+
"""set testkit / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CoronerSpec.scala""""
91+
"""set streamTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "RestartSpec.scala" || "TlsSpec.scala" || "InputStreamSinkSpec.scala" || "ActorRefBackpressureSourceSpec.scala" || "FlowDelaySpec.scala" || "TcpSpec.scala" || "TcpHelper.scala" || "DeprecatedTlsSpec.scala""""
92+
"set remote / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
93+
"""set actorTypedTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ActorContextPipeToSelfSpec.scala" || "ActorContextPipeToSelfTest.java" || "ActorContextSpec.scala" || "BubblingSampleTest.java" || "MailboxSelectorSpec.scala" || "LocalPubSubSpec.scala" || "MessageAdapterSpec.scala""""
94+
"""set cluster / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSpec.scala" || "ClusterHeartbeatReceiverSpec.scala" || "ClusterMessageSerializerSpec.scala""""
95+
"""set clusterTools / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterSingletonLeaseSpec.scala""""
96+
"""set clusterSharding / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "SupervisionSpec.scala" || "ConcurrentStartupShardingSpec.scala" || "StartEntitySpec.scala""""
97+
"""set clusterTyped / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "ClusterReceptionistSpec.scala""""
98+
"""set coordination / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "LeaseDocSpec.scala" || "LeaseDocTest.java""""
99+
"""set distributedData / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "WriteAggregatorSpec.scala" || "ReplicatedDataSerializerSpec.scala""""
100+
"""set persistence / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "PersistentActorBoundedStashingSpec.scala" || "AbstractPersistentFSMTest.java" || "PersistentActorSpec.scala" || "EventSourcedActorFailureSpec.scala" || "TimerPersistentActorSpec.scala""""
101+
"""set persistenceTyped / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "PersistentFsmToTypedMigrationCompileOnlyTest.java""""
102+
// too many intermittent failures in too many different tests
103+
"set persistenceTyped / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())"
104+
"""set akkaPersistenceTck / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "LeveldbJournalNativeSpec.scala" || "LeveldbSnapshotStoreSpec.scala""""
105+
# akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala
106+
# TODO: LineNumberSpecCodeForScala.scala
107+
]
81108
source-patches = [{
82109
path = "akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala"
83110
pattern = "(\\w+): (\\w+) with (\\w+),"
84111
replace-with = "$1: ($2 & $3),"
112+
},{
113+
path = "akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala",
114+
pattern = ".empty(Member.ageOrdering)",
115+
replace-with = ".empty(using Member.ageOrdering)"
116+
},{
117+
path = "akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala"
118+
pattern = ".empty(Member.ageOrdering)",
119+
replace-with = ".empty(using Member.ageOrdering)"
85120
}]
86121
}
87122
akka_akka-http {
@@ -272,10 +307,19 @@ beangle_doc {
272307
}
273308
bilal-fazlani_circe-json-schema.tests = compile-only // Missing test files at runtime
274309
bitlap_rolls {
310+
# Archived
275311
source-patches = [{
276312
path = "rolls-compiler-plugin/src/main/scala/bitlap/rolls/compiler/plugin/RollsCompilerPlugin.scala"
277313
pattern = "def init(options: List[String]): List[PluginPhase]"
278314
replace-with = "override def init(options: List[String]): List[PluginPhase]"
315+
},{
316+
# https://github.com/scala/scala3/pull/24905 removed --print-lines
317+
path = "rolls-compiler-plugin/src/main/scala/bitlap/rolls/compiler/plugin/PluginPhaseFilter.scala"
318+
pattern = ".mkString(Int.MaxValue, true)"
319+
replace-with = ".mkString()"
320+
select-version = {
321+
min = "3.8.1"
322+
}
279323
}]
280324
}
281325
bitmarck-service_fs2-secon.projects.exclude=["de.bitmarck.bms%http4s-secon"] // not found
@@ -1554,6 +1598,15 @@ rayrobdod_string-context-parser-combinator {
15541598
}]
15551599
}
15561600
rcardin_yaes.java.version = 21
1601+
reactivecore_kreuzberg {
1602+
sbt.commands = ["""mapScalacOptions "" "-Wunused:strict-no-implicit-warn" """]
1603+
}
1604+
reactivecore_usql {
1605+
sbt.commands = [
1606+
"""mapScalacOptions "" "-Wunused:strict-no-implicit-warn" """
1607+
"""set Test/unmanagedSources/excludeFilter ~= { _ || "PostgresProfileTest.scala" }""",
1608+
]
1609+
}
15571610
reactivemongo_reactivemongo {
15581611
projects.exclude = ["org.reactivemongo%reactivemongo-alias"] // missing
15591612
projects.overrides = {
@@ -1615,6 +1668,10 @@ sageserpent-open_kineticmerge{
16151668
path = "src/main/scala/com/sageserpent/kineticmerge/core/CodeMotionAnalysis.scala"
16161669
pattern = "@tailrec"
16171670
replace-with = ""
1671+
},{
1672+
path = "src/main/scala/com/sageserpent/kineticmerge/core/MatchAnalysis.scala"
1673+
pattern = "@tailrec"
1674+
replace-with = ""
16181675
}]
16191676
}
16201677
sagifogel_proptics{
@@ -2076,6 +2133,30 @@ typelevel_otel4s-experimental.source-patches = [
20762133
replace-with = " )(tree: quotes.reflect.Definition, _companion: Option[quotes.reflect.Definition]): List[quotes.reflect.Definition] = {"
20772134
}
20782135
]
2136+
typelevel_otel4s-sdk {
2137+
projects.overrides = {
2138+
otel4s-sdk-exporter-prometheus.tests = compile-only
2139+
}
2140+
source-patches = [
2141+
{
2142+
path = "sdk/trace/src/test/scala/org/typelevel/otel4s/sdk/trace/exporter/ConsoleSpanExporterSuite.scala"
2143+
pattern = "ConsoleSpanExporter[IO]("
2144+
replace-with = "ConsoleSpanExporter[IO](using "
2145+
},{
2146+
path = "sdk/logs/src/test/scala/org/typelevel/otel4s/sdk/logs/exporter/ConsoleLogRecordExporterSuite.scala"
2147+
pattern = "ConsoleLogRecordExporter[IO]("
2148+
replace-with = "ConsoleLogRecordExporter[IO](using "
2149+
},{
2150+
path = "sdk/trace/src/main/scala/org/typelevel/otel4s/sdk/trace/SdkTraces.scala"
2151+
pattern = "SdkTraces.noop[F](Async[F], local)"
2152+
replace-with = "SdkTraces.noop[F](using Async[F], local)"
2153+
},{
2154+
path = "sdk/testkit/src/main/scala/org/typelevel/otel4s/sdk/testkit/OpenTelemetrySdkTestkit.scala"
2155+
pattern = ".builder[F]("
2156+
replace-with = ".builder[F](using "
2157+
}
2158+
]
2159+
}
20792160
typelevel_spire {
20802161
source-patches = [{
20812162
path = "core/src/main/scala/spire/optional/vectorOrder.scala"

coordinator/configs/require/source-migration-rewrite/3.4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ scalapy/scalapy
118118
scalikejdbc/scalikejdbc
119119
scodec/scodec-protocols
120120
scorexfoundation/scorex-util
121-
shuwariafrica/version
122121
slick/slick
123122
softwaremill/diffx
124123
softwaremill/tapir

coordinator/configs/require/source-migration-rewrite/3.7

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ scalamock/scalamock
107107
scalatest/scalatest
108108
shiftleftsecurity/codepropertygraph
109109
shuwariafrica/doobie-util
110-
shuwariafrica/version
111110
snowplow/snowplow-scala-analytics-sdk
112111
softwaremill/ox
113112
sovt/spata
@@ -144,4 +143,7 @@ shopstic/caliban
144143
tpolecat/atto
145144
algolia/algoliasearch-client-scala
146145
sageserpent-open/kineticmerge
147-
kitlangton/neotype
146+
kitlangton/neotype
147+
outr/lightdb
148+
flink-extended/flink-scala-api
149+
typelevel/otel4s-sdk

0 commit comments

Comments
 (0)