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

Merge pull request #27909 from akka/wip-27661-proto-v3-dependency-patriknw

Browse source 
adjust dependencies to akka-protobuf-v3, #27661
This commit is contained in:
Patrik Nordwall 2019-10-09 17:04:22 +02:00 • committed by GitHub
commit 9fa452daea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build.sbt
View file

@ -235,7 +235,7 @@ lazy val osgi = akkaModule("akka-osgi")
.settings(parallelExecution in Test := false) .settings(parallelExecution in Test := false)
lazy val persistence = akkaModule("akka-persistence") lazy val persistence = akkaModule("akka-persistence")
.dependsOn(actor, testkit % "test->test", protobufV3) .dependsOn(actor, stream, testkit % "test->test")
.settings(Dependencies.persistence) .settings(Dependencies.persistence)
.settings(AutomaticModuleName.settings("akka.persistence")) .settings(AutomaticModuleName.settings("akka.persistence"))
.settings(OSGi.persistence) .settings(OSGi.persistence)
@ -251,7 +251,7 @@ lazy val persistenceQuery = akkaModule("akka-persistence-query")
.enablePlugins(ScaladocNoVerificationOfDiagrams) .enablePlugins(ScaladocNoVerificationOfDiagrams)
lazy val persistenceShared = akkaModule("akka-persistence-shared") lazy val persistenceShared = akkaModule("akka-persistence-shared")
.dependsOn(persistence % "test->test", testkit % "test->test", remote % "test", protobufV3) .dependsOn(persistence % "test->test", testkit % "test->test", remote % "test")
.settings(Dependencies.persistenceShared) .settings(Dependencies.persistenceShared)
.settings(AutomaticModuleName.settings("akka.persistence.shared")) .settings(AutomaticModuleName.settings("akka.persistence.shared"))
.settings(fork in Test := true) .settings(fork in Test := true)
@ -299,7 +299,6 @@ lazy val remote =
.dependsOn( .dependsOn(
actor, actor,
stream, stream,
protobufV3,
protobuf % "test", protobuf % "test",
actorTests % "test->test", actorTests % "test->test",
testkit % "test->test", testkit % "test->test",
@ -407,7 +406,6 @@ lazy val clusterTyped = akkaModule("akka-cluster-typed")
distributedData, distributedData,
persistence % "test->test", persistence % "test->test",
persistenceTyped % "test->test", persistenceTyped % "test->test",
protobufV3,
actorTestkitTyped % "test->test", actorTestkitTyped % "test->test",
actorTypedTests % "test->test", actorTypedTests % "test->test",
remoteTests % "test->test", remoteTests % "test->test",