raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Update Scala to 3.0.0 final, sbt to 1.5.2 (#30248)

Browse source 
Also: Migrate to sbt slash syntax
This commit is contained in:
Lukas Rytz 2021-05-25 12:50:51 +02:00 • committed by GitHub
parent 49759617ab
commit aa03e8b089
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 145 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

42
project/MultiNode.scala
View file

@ -37,8 +37,8 @@ object MultiNode extends AutoPlugin {
}
val multiExecuteTests =
CliOptions.multiNode.ifTrue(multiNodeExecuteTests in MultiJvm).getOrElse(executeTests in MultiJvm)
val multiTest = CliOptions.multiNode.ifTrue(multiNodeTest in MultiJvm).getOrElse(test in MultiJvm)
CliOptions.multiNode.ifTrue(MultiJvm / multiNodeExecuteTests).getOrElse(MultiJvm / executeTests)
val multiTest = CliOptions.multiNode.ifTrue(MultiJvm / multiNodeTest).getOrElse(MultiJvm / test)
override def trigger = noTrigger
override def requires = plugins.JvmPlugin
@ -70,17 +70,17 @@ object MultiNode extends AutoPlugin {
inConfig(MultiJvm)(scalafmtConfigSettings) ++
Seq(
// Hack because 'provided' dependencies by default are not picked up by the multi-jvm plugin:
managedClasspath in MultiJvm ++= (managedClasspath in Compile).value.filter(_.data.name.contains("silencer-lib")),
jvmOptions in MultiJvm := defaultMultiJvmOptions,
scalacOptions in MultiJvm := (scalacOptions in Test).value,
logLevel in multiJvmCreateLogger := Level.Debug, // to see ssh establishment
assemblyMergeStrategy in assembly in MultiJvm := {
MultiJvm / managedClasspath ++= (Compile / managedClasspath).value.filter(_.data.name.contains("silencer-lib")),
MultiJvm / jvmOptions := defaultMultiJvmOptions,
MultiJvm / scalacOptions := (Test / scalacOptions).value,
multiJvmCreateLogger / logLevel := Level.Debug, // to see ssh establishment
MultiJvm / assembly / assemblyMergeStrategy := {
case n if n.endsWith("logback-test.xml") => MergeStrategy.first
case n if n.toLowerCase.matches("meta-inf.*\\.default") => MergeStrategy.first
case n => (assemblyMergeStrategy in assembly in MultiJvm).value.apply(n)
case n => (MultiJvm / assembly / assemblyMergeStrategy).value.apply(n)
},
multiJvmCreateLogger in MultiJvm := { // to use normal sbt logging infra instead of custom sbt-multijvm-one
val previous = (multiJvmCreateLogger in MultiJvm).value
MultiJvm / multiJvmCreateLogger := { // to use normal sbt logging infra instead of custom sbt-multijvm-one
val previous = (MultiJvm / multiJvmCreateLogger).value
val logger = streams.value.log
(name: String) =>
new Logger {
@ -90,14 +90,14 @@ object MultiNode extends AutoPlugin {
logger.log(level, s"[${scala.Console.BLUE}$name${scala.Console.RESET}] $message")
}
}) ++
CliOptions.hostsFileName.map(multiNodeHostsFileName in MultiJvm := _) ++
CliOptions.javaName.map(multiNodeJavaName in MultiJvm := _) ++
CliOptions.targetDirName.map(multiNodeTargetDirName in MultiJvm := _) ++
CliOptions.hostsFileName.map(MultiJvm / multiNodeHostsFileName := _) ++
CliOptions.javaName.map(MultiJvm / multiNodeJavaName := _) ++
CliOptions.targetDirName.map(MultiJvm / multiNodeTargetDirName := _) ++
(if (multiNodeTestInTest) {
// make sure that MultiJvm tests are executed by the default test target,
// and combine the results from ordinary test and multi-jvm tests
(executeTests in Test) := {
val testResults = (executeTests in Test).value
(Test / executeTests) := {
val testResults = (Test / executeTests).value
val multiNodeResults = multiExecuteTests.value
val overall =
if (testResults.overall.id < multiNodeResults.overall.id)
@ -111,9 +111,9 @@ object MultiNode extends AutoPlugin {
testResults.summaries ++ multiNodeResults.summaries)
}
} else Nil) ++
Def.settings((compile in MultiJvm) := {
(headerCreate in MultiJvm).value
(compile in MultiJvm).value
Def.settings((MultiJvm / compile) := {
(MultiJvm / headerCreate).value
(MultiJvm / compile).value
}) ++ headerSettings(MultiJvm) ++ Seq(validateCompile := compile.?.all(anyConfigsInThisProject).value)
implicit class TestResultOps(val self: TestResult) extends AnyVal {
@ -134,11 +134,11 @@ object MultiNodeScalaTest extends AutoPlugin {
override lazy val projectSettings =
Seq(
extraOptions in MultiJvm := {
val src = (sourceDirectory in MultiJvm).value
MultiJvm / extraOptions := {
val src = (MultiJvm / sourceDirectory).value
(name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq
},
scalatestOptions in MultiJvm := {
MultiJvm / scalatestOptions := {
Seq("-C", "org.scalatest.extra.QuietReporter") ++
(if (excludeTestTags.value.isEmpty) Seq.empty
else