(Prefer) non symbolic typed ask 26306
This commit is contained in:
commit
26b0869318
22 changed files with 171 additions and 46 deletions
34
build.sbt
34
build.sbt
|
|
@ -21,7 +21,7 @@ initialize := {
|
|||
initialize.value
|
||||
}
|
||||
|
||||
akka.AkkaBuild.buildSettings
|
||||
// akka.AkkaBuild.buildSettings
|
||||
shellPrompt := { s => Project.extract(s).currentProject.id + " > " }
|
||||
resolverSettings
|
||||
|
||||
|
|
@ -46,6 +46,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = Seq(
|
|||
actorTyped, actorTypedTests, actorTestkitTyped,
|
||||
persistenceTyped,
|
||||
clusterTyped, clusterShardingTyped,
|
||||
benchJmhTyped,
|
||||
streamTyped,
|
||||
discovery
|
||||
)
|
||||
|
|
@ -58,8 +59,9 @@ lazy val root = Project(
|
|||
.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, protobuf, akkaScalaNightly, docs)
|
||||
})
|
||||
case _ ⇒ Seq(remoteTests, benchJmh, benchJmhTyped, protobuf, akkaScalaNightly, docs)
|
||||
}),
|
||||
crossScalaVersions := Nil, // Allows some modules (typed) to be only for 2.12 sbt/sbt#3465
|
||||
)
|
||||
.settings(
|
||||
unmanagedSources in(Compile, headerCreate) := (baseDirectory.value / "project").**("*.scala").get
|
||||
|
|
@ -102,8 +104,7 @@ lazy val benchJmh = akkaModule("akka-bench-jmh")
|
|||
Seq(
|
||||
actor,
|
||||
stream, streamTests,
|
||||
persistence, persistenceTyped,
|
||||
distributedData, clusterTyped,
|
||||
persistence, distributedData,
|
||||
testkit
|
||||
).map(_ % "compile->compile;compile->test"): _*
|
||||
)
|
||||
|
|
@ -111,6 +112,21 @@ lazy val benchJmh = akkaModule("akka-bench-jmh")
|
|||
.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"): _*
|
||||
)
|
||||
.settings(Dependencies.benchJmh)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.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)
|
||||
|
|
@ -247,6 +263,7 @@ lazy val docs = akkaModule("akka-docs")
|
|||
resolvers += Resolver.jcenterRepo,
|
||||
deployRsyncArtifact := List((paradox in Compile).value -> s"www/docs/akka/${version.value}")
|
||||
)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.enablePlugins(
|
||||
AkkaParadoxPlugin, DeployRsync, NoPublish, ParadoxBrowse,
|
||||
ScaladocNoVerificationOfDiagrams,
|
||||
|
|
@ -395,6 +412,7 @@ lazy val actorTyped = akkaModule("akka-actor-typed")
|
|||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AutomaticModuleName.settings("akka.actor.typed")) // fine for now, eventually new module name to become typed.actor
|
||||
.settings(OSGi.actorTyped)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.settings(
|
||||
initialCommands := """
|
||||
import akka.actor.typed._
|
||||
|
|
@ -417,6 +435,7 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed")
|
|||
)
|
||||
.settings(Dependencies.persistenceShared)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.settings(AutomaticModuleName.settings("akka.persistence.typed"))
|
||||
.settings(OSGi.persistenceTyped)
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
|
@ -435,6 +454,7 @@ lazy val clusterTyped = akkaModule("akka-cluster-typed")
|
|||
remoteTests % "test->test"
|
||||
)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.settings(AutomaticModuleName.settings("akka.cluster.typed"))
|
||||
.disablePlugins(MimaPlugin)
|
||||
.configs(MultiJvm)
|
||||
|
|
@ -451,6 +471,7 @@ lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
|
|||
remoteTests % "test->test"
|
||||
)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.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" ))
|
||||
|
|
@ -467,6 +488,7 @@ lazy val streamTyped = akkaModule("akka-stream-typed")
|
|||
actorTypedTests % "test->test"
|
||||
)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.settings(AutomaticModuleName.settings("akka.stream.typed"))
|
||||
.disablePlugins(MimaPlugin)
|
||||
.enablePlugins(ScaladocNoVerificationOfDiagrams)
|
||||
|
|
@ -475,6 +497,7 @@ lazy val actorTestkitTyped = akkaModule("akka-actor-testkit-typed")
|
|||
.dependsOn(actorTyped, testkit % "compile->compile;test->test")
|
||||
.settings(AutomaticModuleName.settings("akka.actor.testkit.typed"))
|
||||
.settings(Dependencies.actorTestkitTyped)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.disablePlugins(MimaPlugin)
|
||||
|
||||
lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
|
||||
|
|
@ -483,6 +506,7 @@ lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
|
|||
actorTestkitTyped % "compile->compile;test->test"
|
||||
)
|
||||
.settings(AkkaBuild.mayChangeSettings)
|
||||
.settings(AkkaBuild.noScala211)
|
||||
.disablePlugins(MimaPlugin)
|
||||
.enablePlugins(NoPublish)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue