chore: enforce assembly execution order

build.sbt

@@ -368,13 +368,19 @@ lazy val protobufV3 = pekkoModule("protobuf-v3")
     Compile / packageBin / packagedArtifact := Scoped.mkTuple2(
       (Compile / packageBin / artifact).value,
       ReproducibleBuildsPlugin.postProcessJar(OsgiKeys.bundle.value)),
-    Compile / packageBin := ReproducibleBuildsPlugin
-      .postProcessJar((Compile / assembly).value), // package by running assembly
+    // we don't want to change the package task define/semantic here, let osgi be responsible it.
+    (Compile / assembly) := ReproducibleBuildsPlugin
+      .postProcessJar((Compile / assembly).value),
     // Prevent cyclic task dependencies, see https://github.com/sbt/sbt-assembly/issues/365 by
     // redefining the fullClasspath with just what we need to avoid the cyclic task dependency
     assembly / fullClasspath := (Runtime / managedClasspath).value ++ (Compile / products).value.map(Attributed.blank),
     assembly / test := {}, // assembly runs tests for unknown reason which introduces another cyclic dependency to packageBin via exportedJars
+    // Both assembly and osgi change the (Compile / packageBin) task define/semantic, so when we apply assembly then we have to
+    // let osgi first, and let osgi dependOn assembly.
+    OsgiKeys.explodedJars += assembly.value,
     description := "Apache Pekko Protobuf V3 is a shaded version of the protobuf runtime. Original POM: https://github.com/protocolbuffers/protobuf/blob/v3.9.0/java/pom.xml")
+  .settings(PekkoDependWalker.protobufV3Settings)
+  .enablePlugins(DependWalkerPlugin)
 
 lazy val pki =
   pekkoModule("pki")

project/OSGi.scala

@@ -13,10 +13,9 @@
 
 import com.github.sbt.osgi.OsgiKeys
 import com.github.sbt.osgi.SbtOsgi._
-import sbt._
-import sbt.Keys._
-import sbtassembly.AssemblyKeys.assembly
 import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin
+import sbt.Keys._
+import sbt._
 
 object OSGi {
 
@@ -43,7 +42,9 @@ object OSGi {
       // figuring that out from the JDK it was built with)
       OsgiKeys.requireCapability := "osgi.ee;filter:=\"(&(osgi.ee=JavaSE)(version>=1.8))\"",
       // Recent versions of BND create corrupted jars so use JDK jar instead, see https://github.com/sbt/sbt-osgi/pull/81
-      OsgiKeys.packageWithJVMJar := true)
+      OsgiKeys.packageWithJVMJar := true,
+      // Enable caching to avoid duplicate execution.
+      OsgiKeys.cacheStrategy := Some(OsgiKeys.CacheStrategy.Hash))
 
   lazy val actor = osgiSettings ++ Seq(
     OsgiKeys.exportPackage := Seq("org.apache.pekko*"),
@@ -82,13 +83,7 @@ object OSGi {
       configImport(),
       "*"),
     OsgiKeys.exportPackage := Seq("org.apache.pekko.protobufv3.internal.*"),
-    OsgiKeys.privatePackage := Seq("google.protobuf.*"),
-    // Since the jar's generated by sbt-assembly are not added in dependencyClasspath
-    // we need to manually add it to sbt-osgi so it can pick it up. Note that since this
-    // is a fatjar from sbt-assembly we don't have to worry about incorrect osgi
-    // Import-Package header since the protobuf-V3 sbt-project has no real dependencies
-    // (including typical ones such as scala runtime)
-    OsgiKeys.explodedJars := Seq(assembly.value))
+    OsgiKeys.privatePackage := Seq("google.protobuf.*"))
 
   lazy val jackson = exports(Seq("org.apache.pekko.serialization.jackson.*"))
 

project/PekkoDependWalker.scala

@@ -16,11 +16,13 @@
  */
 
 import Jdk9.CompileJdk9
+import com.github.sbt.osgi.OsgiKeys
 import io.github.roiocam.DependWalkerPlugin.autoImport.walkTasks
 import io.github.roiocam.TaskDefine._
 import io.github.roiocam._
 import sbt.Keys._
 import sbt._
+import sbtassembly.AssemblyKeys
 
 object PekkoDependWalker {
 
@@ -30,4 +32,10 @@ object PekkoDependWalker {
         ScopeKeyMatcher((Compile / packageBin).scopedKey, CheckBoth),
         ScopeKeyMatcher((CompileJdk9 / compile).scopedKey, CheckConfig))))
 
+  lazy val protobufV3Settings = Seq(
+    walkTasks := Seq(
+      WalkTask(
+        ScopeKeyMatcher(OsgiKeys.bundle.scopedKey, CheckTask),
+        ScopeKeyMatcher(AssemblyKeys.assembly.scopedKey, CheckTask))))
+
 }