Remove Scala 2.11 for Akka 2.6 (#26760)
* Remove Scala 2.11 for Akka 2.6 * Remove unused import * Update akka-actor/src/main/scala-2.13/akka/compat/Future.scala Co-Authored-By: chbatey <christopher.batey@gmail.com> * Update akka-actor/src/main/scala-2.13/akka/compat/Future.scala Co-Authored-By: chbatey <christopher.batey@gmail.com> * Remove last few bits of 2.11
This commit is contained in:
Christopher Batey
GitHub
parent
d6eb1f237c
commit
0ab7a96ae2
22 changed files with 202 additions and 1053 deletions
327
build.sbt
327
build.sbt
|
|
@ -1,6 +1,11 @@
|
|||
import akka.{AutomaticModuleName, CopyrightHeaderForBuild, ParadoxSupport, ScalafixIgnoreFilePlugin}
|
||||
import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, ParadoxSupport, ScalafixIgnoreFilePlugin }
|
||||
|
||||
enablePlugins(UnidocRoot, TimeStampede, UnidocWithPrValidation, NoPublish, CopyrightHeader,
|
||||
enablePlugins(
|
||||
UnidocRoot,
|
||||
TimeStampede,
|
||||
UnidocWithPrValidation,
|
||||
NoPublish,
|
||||
CopyrightHeader,
|
||||
CopyrightHeaderInPr,
|
||||
ScalafixIgnoreFilePlugin,
|
||||
JavaFormatterPlugin)
|
||||
|
|
@ -10,10 +15,10 @@ addCommandAlias(
|
|||
value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;test:compile;reload")
|
||||
|
||||
import akka.AkkaBuild._
|
||||
import akka.{AkkaBuild, Dependencies, GitHub, OSGi, Protobuf, SigarLoader, VersionGenerator}
|
||||
import akka.{ AkkaBuild, Dependencies, GitHub, OSGi, Protobuf, SigarLoader, VersionGenerator }
|
||||
import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
|
||||
import com.typesafe.tools.mima.plugin.MimaPlugin
|
||||
import sbt.Keys.{initialCommands, parallelExecution}
|
||||
import sbt.Keys.{ initialCommands, parallelExecution }
|
||||
import spray.boilerplate.BoilerplatePlugin
|
||||
|
||||
initialize := {
|
||||
|
|
@ -23,66 +28,66 @@ initialize := {
|
|||
}
|
||||
|
||||
akka.AkkaBuild.buildSettings
|
||||
shellPrompt := { s => Project.extract(s).currentProject.id + " > " }
|
||||
shellPrompt := { s =>
|
||||
Project.extract(s).currentProject.id + " > "
|
||||
}
|
||||
resolverSettings
|
||||
|
||||
def isScala211: Boolean = System.getProperty("akka.build.scalaVersion", "").startsWith("2.11")
|
||||
|
||||
// When this is updated the set of modules in ActorSystem.allModules should also be updated
|
||||
lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
|
||||
actor, actorTests,
|
||||
actor,
|
||||
actorTests,
|
||||
actorTestkitTyped,
|
||||
actorTyped,
|
||||
actorTypedTests,
|
||||
agent,
|
||||
benchJmh,
|
||||
benchJmhTyped,
|
||||
camel,
|
||||
cluster, clusterMetrics, clusterSharding, clusterTools,
|
||||
cluster,
|
||||
clusterMetrics,
|
||||
clusterSharding,
|
||||
clusterShardingTyped,
|
||||
clusterTools,
|
||||
clusterTyped,
|
||||
contrib,
|
||||
coordination,
|
||||
discovery,
|
||||
distributedData,
|
||||
docs,
|
||||
multiNodeTestkit,
|
||||
osgi,
|
||||
persistence, persistenceQuery, persistenceShared, persistenceTck,
|
||||
persistence,
|
||||
persistenceQuery,
|
||||
persistenceShared,
|
||||
persistenceTck,
|
||||
persistenceTyped,
|
||||
protobuf,
|
||||
remote, remoteTests,
|
||||
remote,
|
||||
remoteTests,
|
||||
slf4j,
|
||||
stream, streamTestkit, streamTests, streamTestsTck,
|
||||
testkit,
|
||||
discovery,
|
||||
coordination
|
||||
) ++
|
||||
(if (isScala211) List.empty[ProjectReference]
|
||||
else List[ProjectReference](
|
||||
docs,
|
||||
actorTyped, actorTypedTests, actorTestkitTyped,
|
||||
persistenceTyped,
|
||||
clusterTyped, clusterShardingTyped,
|
||||
benchJmhTyped,
|
||||
streamTyped
|
||||
))
|
||||
stream,
|
||||
streamTestkit,
|
||||
streamTests,
|
||||
streamTestsTck,
|
||||
streamTyped,
|
||||
testkit)
|
||||
|
||||
lazy val root = Project(
|
||||
id = "akka",
|
||||
base = file(".")
|
||||
).aggregate(aggregatedProjects: _*)
|
||||
.settings(rootSettings: _*)
|
||||
.settings(unidocRootIgnoreProjects :=
|
||||
(CrossVersion.partialVersion(scalaVersion.value) match {
|
||||
case Some((2, n)) if n == 11 => aggregatedProjects // ignore all, don't unidoc when scalaVersion is 2.11
|
||||
case _ => Seq(remoteTests, benchJmh, benchJmhTyped, protobuf, akkaScalaNightly, docs)
|
||||
})
|
||||
)
|
||||
.settings(
|
||||
unmanagedSources in(Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get
|
||||
).enablePlugins(CopyrightHeaderForBuild)
|
||||
lazy val root = Project(id = "akka", base = file("."))
|
||||
.aggregate(aggregatedProjects: _*)
|
||||
.settings(rootSettings: _*)
|
||||
.settings(unidocRootIgnoreProjects := Seq(remoteTests, benchJmh, benchJmhTyped, protobuf, akkaScalaNightly, docs))
|
||||
.settings(unmanagedSources in (Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get)
|
||||
.enablePlugins(CopyrightHeaderForBuild)
|
||||
|
||||
lazy val actor = akkaModule("akka-actor")
|
||||
.settings(Dependencies.actor)
|
||||
.settings(OSGi.actor)
|
||||
.settings(AutomaticModuleName.settings("akka.actor"))
|
||||
.settings(
|
||||
unmanagedSourceDirectories in Compile += {
|
||||
val ver = scalaVersion.value.take(4)
|
||||
(scalaSource in Compile).value.getParentFile / s"scala-$ver"
|
||||
}
|
||||
)
|
||||
.settings(unmanagedSourceDirectories in Compile += {
|
||||
val ver = scalaVersion.value.take(4)
|
||||
(scalaSource in Compile).value.getParentFile / s"scala-$ver"
|
||||
})
|
||||
.settings(VersionGenerator.settings)
|
||||
.enablePlugins(BoilerplatePlugin)
|
||||
|
||||
|
|
@ -100,38 +105,26 @@ lazy val agent = akkaModule("akka-agent")
|
|||
.enablePlugins(ScaladocNoVerificationOfDiagrams)
|
||||
|
||||
lazy val akkaScalaNightly = akkaModule("akka-scala-nightly")
|
||||
// remove dependencies that we have to build ourselves (Scala STM)
|
||||
.aggregate(aggregatedProjects diff List[ProjectReference](agent, docs): _*)
|
||||
// remove dependencies that we have to build ourselves (Scala STM)
|
||||
.aggregate(aggregatedProjects.diff(List[ProjectReference](agent, docs)): _*)
|
||||
.disablePlugins(MimaPlugin)
|
||||
.disablePlugins(ValidatePullRequest, MimaPlugin, CopyrightHeaderInPr)
|
||||
|
||||
lazy val benchJmh = akkaModule("akka-bench-jmh")
|
||||
.dependsOn(
|
||||
Seq(
|
||||
actor,
|
||||
stream, streamTests,
|
||||
persistence, distributedData,
|
||||
testkit
|
||||
).map(_ % "compile->compile;compile->test"): _*
|
||||
)
|
||||
.dependsOn(Seq(actor, stream, streamTests, persistence, distributedData, testkit).map(
|
||||
_ % "compile->compile;compile->test"): _*)
|
||||
.settings(Dependencies.benchJmh)
|
||||
.enablePlugins(JmhPlugin, ScaladocNoVerificationOfDiagrams, NoPublish, CopyrightHeader)
|
||||
.disablePlugins(MimaPlugin, WhiteSourcePlugin, ValidatePullRequest, CopyrightHeaderInPr)
|
||||
|
||||
// typed benchmarks only on 2.12+
|
||||
lazy val benchJmhTyped = akkaModule("akka-bench-jmh-typed")
|
||||
.dependsOn(
|
||||
Seq(
|
||||
persistenceTyped,
|
||||
distributedData, clusterTyped,
|
||||
testkit, benchJmh
|
||||
).map(_ % "compile->compile;compile->test"): _*
|
||||
)
|
||||
.dependsOn(Seq(persistenceTyped, distributedData, clusterTyped, testkit, benchJmh).map(
|
||||
_ % "compile->compile;compile->test"): _*)
|
||||
.settings(Dependencies.benchJmh)
|
||||
.enablePlugins(JmhPlugin, ScaladocNoVerificationOfDiagrams, NoPublish, CopyrightHeader)
|
||||
.disablePlugins(MimaPlugin, WhiteSourcePlugin, ValidatePullRequest, CopyrightHeaderInPr)
|
||||
|
||||
|
||||
lazy val camel = akkaModule("akka-camel")
|
||||
.dependsOn(actor, slf4j, testkit % "test->test")
|
||||
.settings(Dependencies.camel)
|
||||
|
|
@ -144,13 +137,10 @@ lazy val cluster = akkaModule("akka-cluster")
|
|||
.settings(AutomaticModuleName.settings("akka.cluster"))
|
||||
.settings(OSGi.cluster)
|
||||
.settings(Protobuf.settings)
|
||||
.settings(
|
||||
parallelExecution in Test := false
|
||||
)
|
||||
.settings(parallelExecution in Test := false)
|
||||
.configs(MultiJvm)
|
||||
.enablePlugins(MultiNodeScalaTest)
|
||||
|
||||
|
||||
lazy val clusterMetrics = akkaModule("akka-cluster-metrics")
|
||||
.dependsOn(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", slf4j % "test->compile")
|
||||
.settings(OSGi.clusterMetrics)
|
||||
|
|
@ -158,23 +148,20 @@ lazy val clusterMetrics = akkaModule("akka-cluster-metrics")
|
|||
.settings(AutomaticModuleName.settings("akka.cluster.metrics"))
|
||||
.settings(Protobuf.settings)
|
||||
.settings(SigarLoader.sigarSettings)
|
||||
.settings(
|
||||
parallelExecution in Test := false
|
||||
)
|
||||
.settings(parallelExecution in Test := false)
|
||||
.configs(MultiJvm)
|
||||
.enablePlugins(MultiNodeScalaTest)
|
||||
|
||||
lazy val clusterSharding = akkaModule("akka-cluster-sharding")
|
||||
// TODO akka-persistence dependency should be provided in pom.xml artifact.
|
||||
// If I only use "provided" here it works, but then we can't run tests.
|
||||
// Scope "test" is alright in the pom.xml, but would have been nicer with
|
||||
// provided.
|
||||
// TODO akka-persistence dependency should be provided in pom.xml artifact.
|
||||
// If I only use "provided" here it works, but then we can't run tests.
|
||||
// Scope "test" is alright in the pom.xml, but would have been nicer with
|
||||
// provided.
|
||||
.dependsOn(
|
||||
cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
|
||||
distributedData,
|
||||
persistence % "compile->compile",
|
||||
clusterTools % "compile->compile;test->test"
|
||||
)
|
||||
clusterTools % "compile->compile;test->test")
|
||||
.settings(Dependencies.clusterSharding)
|
||||
.settings(AutomaticModuleName.settings("akka.cluster.sharding"))
|
||||
.settings(OSGi.clusterSharding)
|
||||
|
|
@ -183,10 +170,7 @@ lazy val clusterSharding = akkaModule("akka-cluster-sharding")
|
|||
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
|
||||
|
||||
lazy val clusterTools = akkaModule("akka-cluster-tools")
|
||||
.dependsOn(
|
||||
cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
|
||||
coordination
|
||||
)
|
||||
.dependsOn(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", coordination)
|
||||
.settings(Dependencies.clusterTools)
|
||||
.settings(AutomaticModuleName.settings("akka.cluster.tools"))
|
||||
.settings(OSGi.clusterTools)
|
||||
|
|
@ -199,9 +183,8 @@ lazy val contrib = akkaModule("akka-contrib")
|
|||
.settings(Dependencies.contrib)
|
||||
.settings(AutomaticModuleName.settings("akka.contrib"))
|
||||
.settings(OSGi.contrib)
|
||||
.settings(
|
||||
description :=
|
||||
"""|
|
||||
.settings(description :=
|
||||
"""|
|
||||
|This subproject provides a home to modules contributed by external
|
||||
|developers which may or may not move into the officially supported code
|
||||
|base over time. A module in this subproject doesn't have to obey the rule
|
||||
|
|
@ -210,8 +193,7 @@ lazy val contrib = akkaModule("akka-contrib")
|
|||
|simplify based on your feedback. A module may be dropped in any release
|
||||
|without prior deprecation. The Lightbend subscription does not cover
|
||||
|support for these modules.
|
||||
|""".stripMargin
|
||||
)
|
||||
|""".stripMargin)
|
||||
.configs(MultiJvm)
|
||||
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -227,7 +209,17 @@ lazy val distributedData = akkaModule("akka-distributed-data")
|
|||
|
||||
lazy val docs = akkaModule("akka-docs")
|
||||
.dependsOn(
|
||||
actor, cluster, clusterMetrics, slf4j, agent, osgi, persistenceTck, persistenceQuery, distributedData, stream, actorTyped,
|
||||
actor,
|
||||
cluster,
|
||||
clusterMetrics,
|
||||
slf4j,
|
||||
agent,
|
||||
osgi,
|
||||
persistenceTck,
|
||||
persistenceQuery,
|
||||
distributedData,
|
||||
stream,
|
||||
actorTyped,
|
||||
camel % "compile->compile;test->test",
|
||||
clusterTools % "compile->compile;test->test",
|
||||
clusterSharding % "compile->compile;test->test",
|
||||
|
|
@ -239,42 +231,43 @@ lazy val docs = akkaModule("akka-docs")
|
|||
clusterTyped % "compile->compile;test->test",
|
||||
clusterShardingTyped % "compile->compile;test->test",
|
||||
actorTypedTests % "compile->compile;test->test",
|
||||
streamTestkit % "compile->compile;test->test"
|
||||
)
|
||||
streamTestkit % "compile->compile;test->test")
|
||||
.settings(Dependencies.docs)
|
||||
.settings(
|
||||
name in(Compile, paradox) := "Akka",
|
||||
name in (Compile, paradox) := "Akka",
|
||||
Compile / paradoxProperties ++= Map(
|
||||
"canonical.base_url" -> "https://doc.akka.io/docs/akka/current",
|
||||
"github.base_url" -> GitHub.url(version.value), // for links like this: @github[#1](#1) or @github[83986f9](83986f9)
|
||||
"extref.akka.http.base_url" -> "https://doc.akka.io/docs/akka-http/current/%s",
|
||||
"extref.wikipedia.base_url" -> "https://en.wikipedia.org/wiki/%s",
|
||||
"extref.github.base_url" -> (GitHub.url(version.value) + "/%s"), // for links to our sources
|
||||
"extref.samples.base_url" -> "https://developer.lightbend.com/start/?group=akka&project=%s",
|
||||
"extref.ecs.base_url" -> "https://example.lightbend.com/v1/download/%s",
|
||||
"scaladoc.akka.base_url" -> "https://doc.akka.io/api/akka/2.5",
|
||||
"scaladoc.akka.http.base_url" -> "https://doc.akka.io/api/akka-http/current",
|
||||
"javadoc.akka.base_url" -> "https://doc.akka.io/japi/akka/2.5",
|
||||
"javadoc.akka.http.base_url" -> "https://doc.akka.io/japi/akka-http/current",
|
||||
"scala.version" -> scalaVersion.value,
|
||||
"scala.binary_version" -> scalaBinaryVersion.value,
|
||||
"akka.version" -> version.value,
|
||||
"sigar_loader.version" -> "1.6.6-rev002",
|
||||
"algolia.docsearch.api_key" -> "543bad5ad786495d9ccd445ed34ed082",
|
||||
"algolia.docsearch.index_name" -> "akka_io",
|
||||
"google.analytics.account" -> "UA-21117439-1",
|
||||
"google.analytics.domain.name" -> "akka.io",
|
||||
"signature.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath,
|
||||
"fiddle.code.base_dir" -> (sourceDirectory in Test).value.getAbsolutePath,
|
||||
"fiddle.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath,
|
||||
),
|
||||
"canonical.base_url" -> "https://doc.akka.io/docs/akka/current",
|
||||
"github.base_url" -> GitHub
|
||||
.url(version.value), // for links like this: @github[#1](#1) or @github[83986f9](83986f9)
|
||||
"extref.akka.http.base_url" -> "https://doc.akka.io/docs/akka-http/current/%s",
|
||||
"extref.wikipedia.base_url" -> "https://en.wikipedia.org/wiki/%s",
|
||||
"extref.github.base_url" -> (GitHub.url(version.value) + "/%s"), // for links to our sources
|
||||
"extref.samples.base_url" -> "https://developer.lightbend.com/start/?group=akka&project=%s",
|
||||
"extref.ecs.base_url" -> "https://example.lightbend.com/v1/download/%s",
|
||||
"scaladoc.akka.base_url" -> "https://doc.akka.io/api/akka/2.5",
|
||||
"scaladoc.akka.http.base_url" -> "https://doc.akka.io/api/akka-http/current",
|
||||
"javadoc.akka.base_url" -> "https://doc.akka.io/japi/akka/2.5",
|
||||
"javadoc.akka.http.base_url" -> "https://doc.akka.io/japi/akka-http/current",
|
||||
"scala.version" -> scalaVersion.value,
|
||||
"scala.binary_version" -> scalaBinaryVersion.value,
|
||||
"akka.version" -> version.value,
|
||||
"sigar_loader.version" -> "1.6.6-rev002",
|
||||
"algolia.docsearch.api_key" -> "543bad5ad786495d9ccd445ed34ed082",
|
||||
"algolia.docsearch.index_name" -> "akka_io",
|
||||
"google.analytics.account" -> "UA-21117439-1",
|
||||
"google.analytics.domain.name" -> "akka.io",
|
||||
"signature.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath,
|
||||
"fiddle.code.base_dir" -> (sourceDirectory in Test).value.getAbsolutePath,
|
||||
"fiddle.akka.base_dir" -> (baseDirectory in ThisBuild).value.getAbsolutePath),
|
||||
Compile / paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
|
||||
resolvers += Resolver.jcenterRepo,
|
||||
apidocRootPackage := "akka",
|
||||
deployRsyncArtifact := List((paradox in Compile).value -> s"www/docs/akka/${version.value}")
|
||||
)
|
||||
deployRsyncArtifact := List((paradox in Compile).value -> s"www/docs/akka/${version.value}"))
|
||||
.enablePlugins(
|
||||
AkkaParadoxPlugin, DeployRsync, NoPublish, ParadoxBrowse,
|
||||
AkkaParadoxPlugin,
|
||||
DeployRsync,
|
||||
NoPublish,
|
||||
ParadoxBrowse,
|
||||
ScaladocNoVerificationOfDiagrams,
|
||||
StreamOperatorsIndexGenerator)
|
||||
.settings(ParadoxSupport.paradoxWithCustomDirectives)
|
||||
|
|
@ -292,9 +285,7 @@ lazy val osgi = akkaModule("akka-osgi")
|
|||
.settings(Dependencies.osgi)
|
||||
.settings(AutomaticModuleName.settings("akka.osgi"))
|
||||
.settings(OSGi.osgi)
|
||||
.settings(
|
||||
parallelExecution in Test := false
|
||||
)
|
||||
.settings(parallelExecution in Test := false)
|
||||
|
||||
lazy val persistence = akkaModule("akka-persistence")
|
||||
.dependsOn(actor, testkit % "test->test", protobuf)
|
||||
|
|
@ -302,31 +293,21 @@ lazy val persistence = akkaModule("akka-persistence")
|
|||
.settings(AutomaticModuleName.settings("akka.persistence"))
|
||||
.settings(OSGi.persistence)
|
||||
.settings(Protobuf.settings)
|
||||
.settings(
|
||||
fork in Test := true
|
||||
)
|
||||
.settings(fork in Test := true)
|
||||
|
||||
lazy val persistenceQuery = akkaModule("akka-persistence-query")
|
||||
.dependsOn(
|
||||
stream,
|
||||
persistence % "compile->compile;test->test",
|
||||
streamTestkit % "test"
|
||||
)
|
||||
.dependsOn(stream, persistence % "compile->compile;test->test", streamTestkit % "test")
|
||||
.settings(Dependencies.persistenceQuery)
|
||||
.settings(AutomaticModuleName.settings("akka.persistence.query"))
|
||||
.settings(OSGi.persistenceQuery)
|
||||
.settings(
|
||||
fork in Test := true
|
||||
)
|
||||
.settings(fork in Test := true)
|
||||
.enablePlugins(ScaladocNoVerificationOfDiagrams)
|
||||
|
||||
lazy val persistenceShared = akkaModule("akka-persistence-shared")
|
||||
.dependsOn(persistence % "test->test", testkit % "test->test", remote % "test", protobuf)
|
||||
.settings(Dependencies.persistenceShared)
|
||||
.settings(AutomaticModuleName.settings("akka.persistence.shared"))
|
||||
.settings(
|
||||
fork in Test := true
|
||||
)
|
||||
.settings(fork in Test := true)
|
||||
.enablePlugins(NoPublish)
|
||||
.disablePlugins(MimaPlugin, WhiteSourcePlugin)
|
||||
|
||||
|
|
@ -335,9 +316,7 @@ lazy val persistenceTck = akkaModule("akka-persistence-tck")
|
|||
.settings(Dependencies.persistenceTck)
|
||||
.settings(AutomaticModuleName.settings("akka.persistence.tck"))
|
||||
//.settings(OSGi.persistenceTck) TODO: we do need to export this as OSGi bundle too?
|
||||
.settings(
|
||||
fork in Test := true
|
||||
)
|
||||
.settings(fork in Test := true)
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
||||
lazy val protobuf = akkaModule("akka-protobuf")
|
||||
|
|
@ -352,17 +331,13 @@ lazy val remote = akkaModule("akka-remote")
|
|||
.settings(AutomaticModuleName.settings("akka.remote"))
|
||||
.settings(OSGi.remote)
|
||||
.settings(Protobuf.settings)
|
||||
.settings(
|
||||
parallelExecution in Test := false
|
||||
)
|
||||
.settings(parallelExecution in Test := false)
|
||||
|
||||
lazy val remoteTests = akkaModule("akka-remote-tests")
|
||||
.dependsOn(actorTests % "test->test", remote % "test->test", streamTestkit % "test", multiNodeTestkit)
|
||||
.settings(Dependencies.remoteTests)
|
||||
.settings(Protobuf.settings)
|
||||
.settings(
|
||||
parallelExecution in Test := false
|
||||
)
|
||||
.settings(parallelExecution in Test := false)
|
||||
.configs(MultiJvm)
|
||||
.enablePlugins(MultiNodeScalaTest, NoPublish)
|
||||
.disablePlugins(MimaPlugin, WhiteSourcePlugin)
|
||||
|
|
@ -402,8 +377,7 @@ lazy val streamTestsTck = akkaModule("akka-stream-tests-tck")
|
|||
// is causing long GC pauses when running with G1 on
|
||||
// the CI build servers. Therefore we fork these tests
|
||||
// to run with small heap without G1.
|
||||
fork in Test := true
|
||||
)
|
||||
fork in Test := true)
|
||||
.enablePlugins(NoPublish)
|
||||
.disablePlugins(MimaPlugin, WhiteSourcePlugin)
|
||||
|
||||
|
|
@ -412,26 +386,22 @@ lazy val testkit = akkaModule("akka-testkit")
|
|||
.settings(Dependencies.testkit)
|
||||
.settings(AutomaticModuleName.settings("akka.actor.testkit"))
|
||||
.settings(OSGi.testkit)
|
||||
.settings(
|
||||
initialCommands += "import akka.testkit._"
|
||||
)
|
||||
.settings(initialCommands += "import akka.testkit._")
|
||||
|
||||
lazy val actorTyped = akkaModule("akka-actor-typed")
|
||||
.dependsOn(actor)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.actor.typed")) // fine for now, eventually new module name to become typed.actor
|
||||
.settings(OSGi.actorTyped)
|
||||
.settings(
|
||||
initialCommands :=
|
||||
"""
|
||||
.settings(initialCommands :=
|
||||
"""
|
||||
import akka.actor.typed._
|
||||
import akka.actor.typed.scaladsl.Behaviors
|
||||
import scala.concurrent._
|
||||
import scala.concurrent.duration._
|
||||
import akka.util.Timeout
|
||||
implicit val timeout = Timeout(5.seconds)
|
||||
"""
|
||||
)
|
||||
""")
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
||||
lazy val persistenceTyped = akkaModule("akka-persistence-typed")
|
||||
|
|
@ -440,8 +410,7 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed")
|
|||
persistence % "compile->compile;test->test",
|
||||
persistenceQuery % "test",
|
||||
actorTypedTests % "test->test",
|
||||
actorTestkitTyped % "compile->compile;test->test"
|
||||
)
|
||||
actorTestkitTyped % "compile->compile;test->test")
|
||||
.settings(Dependencies.persistenceShared)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.persistence.typed"))
|
||||
|
|
@ -459,8 +428,7 @@ lazy val clusterTyped = akkaModule("akka-cluster-typed")
|
|||
protobuf,
|
||||
actorTestkitTyped % "test->test",
|
||||
actorTypedTests % "test->test",
|
||||
remoteTests % "test->test"
|
||||
)
|
||||
remoteTests % "test->test")
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.cluster.typed"))
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -475,8 +443,7 @@ lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
|
|||
actorTestkitTyped % "test->test",
|
||||
actorTypedTests % "test->test",
|
||||
persistenceTyped % "test->test",
|
||||
remoteTests % "test->test"
|
||||
)
|
||||
remoteTests % "test->test")
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.cluster.sharding.typed"))
|
||||
// To be able to import ContainerFormats.proto
|
||||
|
|
@ -491,8 +458,7 @@ lazy val streamTyped = akkaModule("akka-stream-typed")
|
|||
stream,
|
||||
streamTestkit % "test->test",
|
||||
actorTestkitTyped % "test->test",
|
||||
actorTypedTests % "test->test"
|
||||
)
|
||||
actorTypedTests % "test->test")
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.stream.typed"))
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -505,38 +471,25 @@ lazy val actorTestkitTyped = akkaModule("akka-actor-testkit-typed")
|
|||
.disablePlugins(MimaPlugin)
|
||||
|
||||
lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
|
||||
.dependsOn(
|
||||
actorTyped,
|
||||
actorTestkitTyped % "compile->compile;test->test"
|
||||
)
|
||||
.dependsOn(actorTyped, actorTestkitTyped % "compile->compile;test->test")
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.disablePlugins(MimaPlugin)
|
||||
.enablePlugins(NoPublish)
|
||||
|
||||
lazy val discovery = akkaModule("akka-discovery")
|
||||
.dependsOn(
|
||||
actor,
|
||||
testkit % "test->test",
|
||||
actorTests % "test->test"
|
||||
)
|
||||
.dependsOn(actor, testkit % "test->test", actorTests % "test->test")
|
||||
.settings(Dependencies.discovery)
|
||||
.settings(AutomaticModuleName.settings("akka.discovery"))
|
||||
.settings(OSGi.discovery)
|
||||
|
||||
lazy val coordination = akkaModule("akka-coordination")
|
||||
.dependsOn(
|
||||
actor,
|
||||
testkit % "test->test",
|
||||
actorTests % "test->test",
|
||||
cluster % "test->test"
|
||||
)
|
||||
.dependsOn(actor, testkit % "test->test", actorTests % "test->test", cluster % "test->test")
|
||||
.settings(Dependencies.coordination)
|
||||
.settings(AutomaticModuleName.settings("akka.coordination"))
|
||||
.settings(OSGi.coordination)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
||||
|
||||
def akkaModule(name: String): Project =
|
||||
Project(id = name, base = file(name))
|
||||
.enablePlugins(ReproducibleBuildsPlugin)
|
||||
|
|
@ -560,20 +513,20 @@ addCommandAlias("allClusterCore", commandValue(cluster))
|
|||
addCommandAlias("allClusterMetrics", commandValue(clusterMetrics))
|
||||
addCommandAlias("allClusterSharding", commandValue(clusterSharding))
|
||||
addCommandAlias("allClusterTools", commandValue(clusterTools))
|
||||
addCommandAlias("allCluster", Seq(
|
||||
commandValue(cluster),
|
||||
commandValue(distributedData),
|
||||
commandValue(clusterSharding),
|
||||
commandValue(clusterTools)).mkString)
|
||||
addCommandAlias(
|
||||
"allCluster",
|
||||
Seq(commandValue(cluster), commandValue(distributedData), commandValue(clusterSharding), commandValue(clusterTools)).mkString)
|
||||
addCommandAlias("allCoordination", commandValue(coordination))
|
||||
addCommandAlias("allDistributedData", commandValue(distributedData))
|
||||
addCommandAlias("allPersistence", commandValue(persistence))
|
||||
addCommandAlias("allStream", commandValue(stream, Some(streamTests)))
|
||||
addCommandAlias("allDiscovery", commandValue(discovery))
|
||||
addCommandAlias("allTyped", Seq(
|
||||
commandValue(actorTyped, Some(actorTypedTests)),
|
||||
commandValue(actorTestkitTyped),
|
||||
commandValue(clusterTyped),
|
||||
commandValue(clusterShardingTyped),
|
||||
commandValue(persistenceTyped),
|
||||
commandValue(streamTyped)).mkString)
|
||||
addCommandAlias(
|
||||
"allTyped",
|
||||
Seq(
|
||||
commandValue(actorTyped, Some(actorTypedTests)),
|
||||
commandValue(actorTestkitTyped),
|
||||
commandValue(clusterTyped),
|
||||
commandValue(clusterShardingTyped),
|
||||
commandValue(persistenceTyped),
|
||||
commandValue(streamTyped)).mkString)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue