From b40873dc10aea8c9fa58bc616be63ca161e28cda Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 27 Mar 2020 09:38:12 +0100
Subject: [PATCH] Remove last crossPaths occurrence (#28817)

We were already not using it for most of the build
---
 build.sbt              | 1 -
 project/Protobuf.scala | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index dc07bccd96..59d2f657ac 100644
--- a/build.sbt
+++ b/build.sbt
@@ -296,7 +296,6 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
           .rename("com.google.protobuf.**" -> "akka.protobufv3.internal.@1")
           .inLibrary(Dependencies.Compile.protobufRuntime)),
     assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false, includeBin = false),
-    crossPaths := false,
     autoScalaLibrary := false, // do not include scala dependency in pom
     exportJars := true, // in dependent projects, use assembled and shaded jar
     makePomConfiguration := makePomConfiguration.value
diff --git a/project/Protobuf.scala b/project/Protobuf.scala
index 6d5b732404..77cde53ac3 100644
--- a/project/Protobuf.scala
+++ b/project/Protobuf.scala
@@ -30,7 +30,7 @@ object Protobuf {
     importPath := None,
     // this keeps intellij happy for files that use the shaded protobuf
     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",
     protocVersion := "3.10.0",
     generate := {