Separate typed into modules (#24173)

Creates the following modules:

akka.actor.typed
akka.persistence.typed
akka.cluster.typed
akka.cluster.sharding.typed

Differences from untyped:

DData and cluster singleton are inside cluster. DData is in the package akka.cluster.dddata.typed

Refs #23632
This commit is contained in:
Christopher Batey 2017-12-18 14:50:46 +00:00 committed by GitHub
parent d2fd897926
commit f7b3b483a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
140 changed files with 857 additions and 761 deletions

View file

@ -37,7 +37,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = Seq(
slf4j,
stream, streamTestkit, streamTests, streamTestsTck,
testkit,
typed, typedTests, typedTestkit
actorTyped, actorTypedTests, typedTestkit, persistenceTyped, clusterTyped, clusterShardingTyped
)
lazy val root = Project(
@ -189,8 +189,11 @@ lazy val docs = akkaModule("akka-docs")
testkit % "compile->compile;test->test",
remote % "compile->compile;test->test",
persistence % "compile->compile;provided->provided;test->test",
typed % "compile->compile;test->test",
typedTests % "compile->compile;test->test",
actorTyped % "compile->compile;test->test",
persistenceTyped % "compile->compile;test->test",
clusterTyped % "compile->compile;test->test",
clusterShardingTyped % "compile->compile;test->test",
actorTypedTests % "compile->compile;test->test",
streamTestkit % "compile->compile;test->test"
)
.settings(Dependencies.docs)
@ -222,7 +225,7 @@ lazy val docs = akkaModule("akka-docs")
),
paradoxGroups := Map("Language" -> Seq("Scala", "Java")),
resolvers += Resolver.jcenterRepo,
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, ScaladocNoVerificationOfDiagrams)
.disablePlugins(MimaPlugin, WhiteSourcePlugin)
@ -361,19 +364,10 @@ lazy val testkit = akkaModule("akka-testkit")
initialCommands += "import akka.testkit._"
)
lazy val typed = akkaModule("akka-typed")
.dependsOn(
testkit % "compile->compile;test->test",
persistence % "provided->compile",
cluster % "provided->compile",
clusterTools % "provided->compile",
clusterSharding % "provided->compile",
distributedData % "provided->compile"
)
lazy val actorTyped = akkaModule("akka-actor-typed")
.dependsOn(actor)
.settings(AkkaBuild.mayChangeSettings)
.settings(AutomaticModuleName.settings("akka.typed")) // fine for now, eventually new module name to become typed.actor
// To be ablet to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf" ))
.settings(AutomaticModuleName.settings("akka.actor.typed")) // fine for now, eventually new module name to become typed.actor
.settings(
initialCommands := """
import akka.typed._
@ -386,21 +380,59 @@ lazy val typed = akkaModule("akka-typed")
)
.disablePlugins(MimaPlugin)
lazy val typedTestkit = akkaModule("akka-typed-testkit")
.dependsOn(typed, testkit % "compile->compile;test->test")
.settings(AutomaticModuleName.settings("akka.typed.testkit"))
lazy val persistenceTyped = akkaModule("akka-persistence-typed")
.dependsOn(
actorTyped,
persistence,
testkit % "test->test",
typedTestkit % "test->test",
actorTypedTests % "test->test"
)
.settings(AkkaBuild.mayChangeSettings)
.settings(AutomaticModuleName.settings("akka.persistence.typed"))
.disablePlugins(MimaPlugin)
lazy val typedTests = akkaModule("akka-typed-tests")
lazy val clusterTyped = akkaModule("akka-cluster-typed")
.dependsOn(
typed,
typedTestkit % "compile->compile;test->provided;test->test",
// the provided dependencies
persistence % "compile->compile;test->test",
cluster % "test->test",
actorTyped,
cluster,
clusterTools,
distributedData,
persistence % "provided->test",
persistenceTyped % "provided->test",
testkit % "test->test",
typedTestkit % "test->test",
actorTypedTests % "test->test"
)
.settings(AkkaBuild.mayChangeSettings)
.settings(AutomaticModuleName.settings("akka.cluster.typed"))
.disablePlugins(MimaPlugin)
lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
.dependsOn(
clusterTyped,
persistenceTyped,
clusterSharding,
distributedData
testkit % "test->test",
typedTestkit % "test->test",
actorTypedTests % "test->test"
)
.settings(AkkaBuild.mayChangeSettings)
.settings(AutomaticModuleName.settings("akka.cluster.sharding.typed"))
// To be able to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf" ))
.disablePlugins(MimaPlugin)
lazy val typedTestkit = akkaModule("akka-testkit-typed")
.dependsOn(actorTyped, testkit % "compile->compile;test->test")
.settings(AutomaticModuleName.settings("akka.testkit.typed"))
.disablePlugins(MimaPlugin)
lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
.dependsOn(
actorTyped,
typedTestkit % "compile->compile;test->provided;test->test"
)
.settings(AkkaBuild.mayChangeSettings)
.disablePlugins(MimaPlugin)