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

Remove last crossPaths occurrence (#28817)

Browse source 
We were already not using it for most of the build
This commit is contained in:
Arnout Engelen 2020-03-27 09:38:12 +01:00 • committed by GitHub
parent a04a14d022
commit b40873dc10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build.sbt
View file

@ -296,7 +296,6 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
.rename("com.google.protobuf.**" -> "akka.protobufv3.internal.@1") .rename("com.google.protobuf.**" -> "akka.protobufv3.internal.@1")
.inLibrary(Dependencies.Compile.protobufRuntime)), .inLibrary(Dependencies.Compile.protobufRuntime)),
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeBin = false), assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeBin = false),
crossPaths := false,
autoScalaLibrary := false, // do not include scala dependency in pom autoScalaLibrary := false, // do not include scala dependency in pom
exportJars := true, // in dependent projects, use assembled and shaded jar exportJars := true, // in dependent projects, use assembled and shaded jar
makePomConfiguration := makePomConfiguration.value makePomConfiguration := makePomConfiguration.value

2
project/Protobuf.scala
View file

@ -30,7 +30,7 @@ object Protobuf {
importPath := None, importPath := None,
// this keeps intellij happy for files that use the shaded protobuf // this keeps intellij happy for files that use the shaded protobuf
Compile / unmanagedJars ++= Seq( Compile / unmanagedJars ++= Seq(
baseDirectory.value / ".." / "akka-protobuf-v3" / "target" / s"akka-protobuf-v3-assembly-${version.value}.jar"), baseDirectory.value / ".." / "akka-protobuf-v3" / "target" / s"scala-${scalaBinaryVersion.value}" / s"akka-protobuf-v3-assembly-${version.value}.jar"),
protoc := "protoc", protoc := "protoc",
protocVersion := "3.10.0", protocVersion := "3.10.0",
generate := { generate := {