Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 3.11.1
runner.dialect = scala213
runner.dialect = scala213source3
project.git = true
style = defaultWithAlign
docstrings.style = Asterisk
Expand Down Expand Up @@ -75,3 +75,13 @@ project.excludeFilters = [
"scripts/authors.scala"
]
project.layout = StandardConvention

rewrite.scala3.convertToNewSyntax = true
runner {
dialectOverride {
allowSignificantIndentation = false
allowAsForImportRename = false
allowStarWildcardImport = false
allowPostfixStarVarargSplices = false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class ClusterBootstrapDiscoveryBackoffIntegrationSpec extends AnyWordSpecLike wi
val bootstrapB = ClusterBootstrap(systemB)

val baseTime = System.currentTimeMillis()
case class DiscoveryRequest(time: Long, attempt: Int, res: Future[_]) {
case class DiscoveryRequest(time: Long, attempt: Int, res: Future[?]) {
override def toString = s"DiscoveryRequest(${(time - baseTime).millis}, $attempt, $res)"
}
val resolveProbe = TestProbe()(systemA)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ object ClusterHttpManagementRoutes extends ClusterHttpManagementJsonProtocol {
import pekko.stream.scaladsl.Source
import scala.concurrent.{ ExecutionContext, Promise }

val eventClasses: Map[String, Class[_]] = Map(
val eventClasses: Map[String, Class[?]] = Map(
"ClusterDomainEvent" -> classOf[ClusterEvent.ClusterDomainEvent],
"MemberEvent" -> classOf[ClusterEvent.MemberEvent],
"MemberJoined" -> classOf[ClusterEvent.MemberJoined],
Expand All @@ -171,7 +171,7 @@ object ClusterHttpManagementRoutes extends ClusterHttpManagementJsonProtocol {
parameter("type".as[String].*) { providedEventTypes =>
val classes =
if (providedEventTypes.nonEmpty)
providedEventTypes.foldLeft(List.empty[Class[_]]) {
providedEventTypes.foldLeft(List.empty[Class[?]]) {
case (accum, eventType) =>
eventClasses.get(eventType).toList ::: accum
}
Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object Common extends AutoPlugin {

val isScala3 = Def.setting(scalaBinaryVersion.value == "3")

override lazy val projectSettings: Seq[sbt.Def.Setting[_]] =
override lazy val projectSettings: Seq[sbt.Def.Setting[?]] =
Seq(
startYear := Some(2022),
homepage := Some(url("https://pekko.apache.org/")),
Expand Down
6 changes: 3 additions & 3 deletions project/CopyrightHeader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ trait CopyrightHeader extends AutoPlugin {

override def trigger: PluginTrigger = allRequirements

protected def headerMappingSettings: Seq[Def.Setting[_]] =
protected def headerMappingSettings: Seq[Def.Setting[?]] =
Seq(Compile, Test).flatMap { config =>
inConfig(config)(
Seq(
Expand All @@ -35,9 +35,9 @@ trait CopyrightHeader extends AutoPlugin {
HeaderFileType("template") -> cStyleComment)))
}

override def projectSettings: Seq[Def.Setting[_]] = Def.settings(headerMappingSettings, additional)
override def projectSettings: Seq[Def.Setting[?]] = Def.settings(headerMappingSettings, additional)

def additional: Seq[Def.Setting[_]] =
def additional: Seq[Def.Setting[?]] =
Def.settings(Compile / compile := {
(Compile / headerCreate).value
(Compile / compile).value
Expand Down