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

Update sbt-osgi to 0.10.0

Browse source
This commit is contained in:
Matthew de Detrich 2024-01-28 11:17:31 +11:00 • committed by Matthew de Detrich
parent 24ce39c010
commit 613ccf6d19
3 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
build.sbt
View file

@ -132,7 +132,7 @@ lazy val actor = pekkoModule("actor")
.settings(AddMetaInfLicenseFiles.actorSettings)
.settings(VersionGenerator.settings)
.settings(serialversionRemoverPluginSettings)
.enablePlugins(BoilerplatePlugin)
.enablePlugins(BoilerplatePlugin, SbtOsgi)
lazy val actorTests = pekkoModule("actor-tests")
.dependsOn(testkit % "compile->compile;test->test", actor)
@ -167,7 +167,7 @@ lazy val cluster = pekkoModule("cluster")
.settings(OSGi.cluster)
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
.enablePlugins(MultiNodeScalaTest)
.enablePlugins(MultiNodeScalaTest, SbtOsgi)
lazy val clusterMetrics = pekkoModule("cluster-metrics")
.dependsOn(
@ -180,7 +180,7 @@ lazy val clusterMetrics = pekkoModule("cluster-metrics")
.settings(Protobuf.settings)
.settings(SigarLoader.sigarSettings)
.settings(Test / parallelExecution := false)
.enablePlugins(MultiNodeScalaTest)
.enablePlugins(MultiNodeScalaTest, SbtOsgi)
lazy val clusterSharding = pekkoModule("cluster-sharding")
// TODO pekko-persistence dependency should be provided in pom.xml artifact.
@ -197,8 +197,7 @@ lazy val clusterSharding = pekkoModule("cluster-sharding")
.settings(AutomaticModuleName.settings("pekko.cluster.sharding"))
.settings(OSGi.clusterSharding)
.settings(Protobuf.settings)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
.enablePlugins(Jdk9)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams, Jdk9, SbtOsgi)
lazy val clusterTools = pekkoModule("cluster-tools")
.dependsOn(
@ -209,7 +208,7 @@ lazy val clusterTools = pekkoModule("cluster-tools")
.settings(AutomaticModuleName.settings("pekko.cluster.tools"))
.settings(OSGi.clusterTools)
.settings(Protobuf.settings)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
.enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams, SbtOsgi)
lazy val distributedData = pekkoModule("distributed-data")
.dependsOn(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", jackson % "test->test")
@ -218,7 +217,7 @@ lazy val distributedData = pekkoModule("distributed-data")
.settings(AddMetaInfLicenseFiles.distributedDataSettings)
.settings(OSGi.distributedData)
.settings(Protobuf.settings)
.enablePlugins(MultiNodeScalaTest)
.enablePlugins(MultiNodeScalaTest, SbtOsgi)
lazy val docs = pekkoModule("docs")
.configs(Jdk9.TestJdk9)
@ -274,7 +273,7 @@ lazy val jackson = pekkoModule("serialization-jackson")
.settings(AutomaticModuleName.settings("pekko.serialization.jackson"))
.settings(OSGi.jackson)
.settings(javacOptions += "-parameters")
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.enablePlugins(ScaladocNoVerificationOfDiagrams, SbtOsgi)
lazy val multiNodeTestkit = pekkoModule("multi-node-testkit")
.dependsOn(remote, testkit)
@ -289,6 +288,7 @@ lazy val osgi = pekkoModule("osgi")
.settings(AutomaticModuleName.settings("pekko.osgi"))
.settings(OSGi.osgi)
.settings(Test / parallelExecution := false)
.enablePlugins(SbtOsgi)
lazy val persistence = pekkoModule("persistence")
.dependsOn(actor, stream, testkit % "test->test")
@ -297,6 +297,7 @@ lazy val persistence = pekkoModule("persistence")
.settings(OSGi.persistence)
.settings(Protobuf.settings)
.settings(Test / fork := true)
.enablePlugins(SbtOsgi)
lazy val persistenceQuery = pekkoModule("persistence-query")
.dependsOn(
@ -312,7 +313,7 @@ lazy val persistenceQuery = pekkoModule("persistence-query")
// To be able to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "remote" / "src" / "main" / "protobuf"))
.settings(Test / fork := true)
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.enablePlugins(ScaladocNoVerificationOfDiagrams, SbtOsgi)
lazy val persistenceShared = pekkoModule("persistence-shared")
.dependsOn(persistence % "test->test", testkit % "test->test", remote % Test)
@ -357,7 +358,7 @@ lazy val protobufV3 = pekkoModule("protobuf-v3")
.settings(OSGi.protobufV3)
.settings(AutomaticModuleName.settings("pekko.protobuf.v3"))
.settings(AddMetaInfLicenseFiles.protobufV3Settings)
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.enablePlugins(ScaladocNoVerificationOfDiagrams, SbtOsgi)
.disablePlugins(MimaPlugin)
.settings(
libraryDependencies += Dependencies.Compile.Provided.protobufRuntime,
@ -407,7 +408,7 @@ lazy val remote =
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
.settings(serialversionRemoverPluginSettings)
.enablePlugins(Jdk9)
.enablePlugins(Jdk9, SbtOsgi)
lazy val remoteTests = pekkoModule("remote-tests")
.dependsOn(
@ -427,6 +428,7 @@ lazy val slf4j = pekkoModule("slf4j")
.settings(Dependencies.slf4j)
.settings(AutomaticModuleName.settings("pekko.slf4j"))
.settings(OSGi.slf4j)
.enablePlugins(SbtOsgi)
lazy val stream = pekkoModule("stream")
.dependsOn(actor, protobufV3)
@ -434,13 +436,14 @@ lazy val stream = pekkoModule("stream")
.settings(AutomaticModuleName.settings("pekko.stream"))
.settings(OSGi.stream)
.settings(Protobuf.settings)
.enablePlugins(BoilerplatePlugin, Jdk9)
.enablePlugins(BoilerplatePlugin, Jdk9, SbtOsgi)
lazy val streamTestkit = pekkoModule("stream-testkit")
.dependsOn(stream, testkit % "compile->compile;test->test")
.settings(Dependencies.streamTestkit)
.settings(AutomaticModuleName.settings("pekko.stream.testkit"))
.settings(OSGi.streamTestkit)
.enablePlugins(SbtOsgi)
lazy val streamTests = pekkoModule("stream-tests")
.configs(Jdk9.TestJdk9)
@ -467,6 +470,7 @@ lazy val testkit = pekkoModule("testkit")
.settings(AutomaticModuleName.settings("pekko.actor.testkit"))
.settings(OSGi.testkit)
.settings(initialCommands += "import org.apache.pekko.testkit._")
.enablePlugins(SbtOsgi)
lazy val actorTyped = pekkoModule("actor-typed")
.dependsOn(actor, slf4j)
@ -487,7 +491,7 @@ lazy val actorTyped = pekkoModule("actor-typed")
implicit val timeout = Timeout(5 seconds)
""")
.enablePlugins(Jdk9)
.enablePlugins(Jdk9, SbtOsgi)
lazy val persistenceTyped = pekkoModule("persistence-typed")
.dependsOn(
@ -508,6 +512,7 @@ lazy val persistenceTyped = pekkoModule("persistence-typed")
// To be able to import ContainerFormats.proto
.settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "remote" / "src" / "main" / "protobuf"))
.settings(OSGi.persistenceTyped)
.enablePlugins(SbtOsgi)
lazy val clusterTyped = pekkoModule("cluster-typed")
.dependsOn(
@ -580,12 +585,14 @@ lazy val discovery = pekkoModule("discovery")
.settings(Dependencies.discovery)
.settings(AutomaticModuleName.settings("pekko.discovery"))
.settings(OSGi.discovery)
.enablePlugins(SbtOsgi)
lazy val coordination = pekkoModule("coordination")
.dependsOn(actor, testkit % "test->test", actorTests % "test->test")
.settings(Dependencies.coordination)
.settings(AutomaticModuleName.settings("pekko.coordination"))
.settings(OSGi.coordination)
.enablePlugins(SbtOsgi)
lazy val billOfMaterials = Project("bill-of-materials", file("bill-of-materials"))
.enablePlugins(BillOfMaterialsPlugin)