Simplify sbt-osgi interop (#42)

Author: raboof

src/main/scala/ReproducibleBuildsPlugin.scala

@@ -39,17 +39,7 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
     disambiguation in Compile := ((packagedFiles: Iterable[File]) =>
       Some(sys.env.get("USER").orElse(sys.env.get("USERNAME")).map(_ + "-").getOrElse("") + packagedFiles.map(_.lastModified()).max)
     ),
-    packageBin in Compile := {
-      val bin = (packageBin in Compile).value
-      val dir = bin.getParentFile.toPath.resolve("stripped")
-      dir.toFile.mkdir()
-      val out = dir.resolve(bin.getName).toFile
-      new ZipStripper()
-        .addFileStripper("META-INF/MANIFEST.MF", new ManifestStripper())
-        .addFileStripper("META-INF/maven/\\S*/pom.properties", new PomPropertiesStripper())
-        .strip(bin, out)
-      out
-    },
+    packageBin in Compile := postProcessJar((packageBin in Compile).value),
     artifactPath in reproducibleBuildsCertification := artifactPathSetting(artifact in reproducibleBuildsCertification).value,
     reproducibleBuildsPackageName := moduleName.value + "_" + scalaBinaryVersion.value,
     reproducibleBuildsCertification := {
@@ -136,6 +126,17 @@ object ReproducibleBuildsPlugin extends AutoPlugin {
     }
   )
 
+  def postProcessJar(jar: File): File = {
+    val dir = jar.getParentFile.toPath.resolve("stripped")
+    dir.toFile.mkdir()
+    val out = dir.resolve(jar.getName).toFile
+    new ZipStripper()
+      .addFileStripper("META-INF/MANIFEST.MF", new ManifestStripper())
+      .addFileStripper("META-INF/maven/\\S*/pom.properties", new PomPropertiesStripper())
+      .strip(jar, out)
+    out
+  }
+
   private def checkVerification(ours: File, uri: URI): Unit = {
       import scala.collection.JavaConverters._
       val ourSums = parseChecksums(Files.readAllLines(ours.toPath, Charset.forName("UTF-8")).asScala.toList)

src/sbt-test/sbt-reproducible-builds/osgi/build.sbt

@@ -5,12 +5,9 @@ enablePlugins(SbtOsgi)
 
 OsgiKeys.exportPackage := Seq("net.bzzt")
 
-// When replacing packageBin with the OSGi bundle...
-Compile / packageBin := OsgiKeys.bundle.value
-
-// We need to explicitly load the rb settings again to
-// make sure the OSGi package is post-processed:
-ReproducibleBuildsPlugin.projectSettings
+// When replacing packageBin with the OSGi bundle,
+// we need to explicitly post-process it:
+Compile / packageBin := ReproducibleBuildsPlugin.postProcessJar(OsgiKeys.bundle.value)
 
 // Make the filename static for easier validation:
 disambiguation in Compile := (_ => Some("STATIC"))