Merge remote-tracking branch 'origin/main' into package-fix

# Conflicts:
#	src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala

.github/workflows/ci.yml

@@ -0,0 +1,97 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the workflow description
+# to meet your needs, then regenerate this file.
+
+name: Continuous Integration
+
+on:
+  pull_request:
+    branches: ['**']
+  push:
+    branches: ['**']
+    tags: [v*]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  build:
+    name: Build and Test
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.12.18]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: Check that workflows are up to date
+        run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
+
+      - run: sbt '++ ${{ matrix.scala }}' test scripted
+
+      - name: Compress target directories
+        run: tar cf targets.tar target project/target
+
+      - name: Upload target directories
+        uses: actions/upload-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
+          path: targets.tar
+
+  publish:
+    name: Publish Artifacts
+    needs: [build]
+    if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.12.18]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: Download target directories (2.12.18)
+        uses: actions/download-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
+
+      - name: Inflate target directories (2.12.18)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Publish project
+        env:
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        run: sbt ci-release

.github/workflows/clean.yml

@@ -0,0 +1,60 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the workflow description
+# to meet your needs, then regenerate this file.
+
+name: Clean
+
+on: push
+
+jobs:
+  delete-artifacts:
+    name: Delete Artifacts
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Delete artifacts
+        shell: bash {0}
+        run: |
+          # Customize those three lines with your repository and credentials:
+          REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
+
+          # A shortcut to call GitHub API.
+          ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
+
+          # A temporary file which receives HTTP response headers.
+          TMPFILE=$(mktemp)
+
+          # An associative array, key: artifact name, value: number of artifacts of that name.
+          declare -A ARTCOUNT
+
+          # Process all artifacts on this repository, loop on returned "pages".
+          URL=$REPO/actions/artifacts
+          while [[ -n "$URL" ]]; do
+
+            # Get current page, get response headers in a temporary file.
+            JSON=$(ghapi --dump-header $TMPFILE "$URL")
+
+            # Get URL of next page. Will be empty if we are at the last page.
+            URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*<//' -e 's/>.*//')
+            rm -f $TMPFILE
+
+            # Number of artifacts on this page:
+            COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') ))
+
+            # Loop on all artifacts on this page.
+            for ((i=0; $i < $COUNT; i++)); do
+
+              # Get name of artifact and count instances of this name.
+              name=$(jq <<<$JSON -r ".artifacts[$i].name?")
+              ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1))
+
+              id=$(jq <<<$JSON -r ".artifacts[$i].id?")
+              size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") ))
+              printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
+              ghapi -X DELETE $REPO/actions/artifacts/$id
+            done
+          done

README.md

@@ -1,7 +1,7 @@
 sbt-osgi
 ========
 
-[![Build Status](https://travis-ci.org/sbt/sbt-osgi.svg?branch=master)](https://travis-ci.org/sbt/sbt-osgi)
+[![Build Status](https://github.com/sbt/sbt-osgi/actions/workflows/ci.yml/badge.svg)](https://github.com/sbt/sbt-osgi/actions/workflows/ci.yml)
 
 Plugin for [sbt](http://www.scala-sbt.org) to to create [OSGi](http://www.osgi.org/) bundles.
 

build.sbt

@@ -1,20 +1,96 @@
-organization := "com.typesafe.sbt"
+lazy val scala212 = "2.12.18"
+ThisBuild / crossScalaVersions := Seq(scala212)
+ThisBuild / scalaVersion := scala212
+ThisBuild / dynverSonatypeSnapshots := true
 
-name := "sbt-osgi"
+// So that publishLocal doesn't continuously create new versions
+def versionFmt(out: sbtdynver.GitDescribeOutput): String = {
+  val snapshotSuffix = if
+    (out.isSnapshot()) "-SNAPSHOT"
+  else ""
+  out.ref.dropPrefix + snapshotSuffix
+}
 
-enablePlugins(SbtPlugin)
+def fallbackVersion(d: java.util.Date): String = s"HEAD-${sbtdynver.DynVer timestamp d}"
 
-licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
+ThisBuild / version := dynverGitDescribeOutput.value.mkVersion(versionFmt, fallbackVersion(dynverCurrentDate.value))
+ThisBuild / dynver := {
+  val d = new java.util.Date
+  sbtdynver.DynVer.getGitDescribeOutput(d).mkVersion(versionFmt, fallbackVersion(d))
+}
 
-libraryDependencies ++= Dependencies.sbtOsgi
+ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted")))
 
-crossSbtVersions := Seq("1.2.8")
+ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
+ThisBuild / githubWorkflowPublishTargetBranches :=
+  Seq(
+    RefPredicate.StartsWith(Ref.Tag("v")),
+    RefPredicate.Equals(Ref.Branch("main"))
+  )
+ThisBuild / githubWorkflowPublish := Seq(
+  WorkflowStep.Sbt(
+    commands = List("ci-release"),
+    name = Some("Publish project"),
+    env = Map(
+      "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}",
+      "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}",
+      "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}",
+      "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}"
+    )
+  )
+)
 
+name := "sbt-osgi"
+enablePlugins(SbtPlugin)
+libraryDependencies ++= Dependencies.sbtOsgi
 scalacOptions ++= Seq(
   "-unchecked",
   "-deprecation",
   "-Xlint",
   "-encoding", "UTF-8"
 )
+(pluginCrossBuild / sbtVersion) := {
+  scalaBinaryVersion.value match {
+    case "2.12" => "1.2.8"
+  }
+}
+scriptedLaunchOpts += "-Xmx1024m"
+scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
+// scriptedBufferLog := false
 
-publishMavenStyle := false
+ThisBuild / licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
+ThisBuild / organization := "com.github.sbt"
+ThisBuild / homepage := Some(url("https://github.com/sbt/sbt-osgi"))
+ThisBuild / scmInfo := Some(
+  ScmInfo(
+    url("https://github.com/sbt/sbt-osgi"),
+    "scm:[email protected]:sbt/sbt-osgi.git"
+  )
+)
+ThisBuild / description := "sbt plugin for creating OSGi bundles"
+ThisBuild / developers := List(
+  Developer(
+    id = "eed3si9n",
+    name = "Eugene Yokota",
+    email = "[email protected]",
+    url = url("https://github.com/eed3si9n")
+  ),
+  Developer(
+    id = "hseeberger",
+    name = "Heiko Seeberger",
+    email = "@hseeberger",
+    url = url("https://github.com/hseeberger")
+  ),
+  Developer(
+    id = "mdedetrich",
+    name = "Matthew de Detrich",
+    email = "[email protected]",
+    url = url("https://github.com/mdedetrich")
+  ),
+  Developer(
+    id = "romainreuillon",
+    name = "Romain Reuillon",
+    email = "[email protected]",
+    url = url("https://github.com/romainreuillon")
+  )
+)

project/Dependencies.scala

@@ -3,7 +3,7 @@ import sbt._
 object Library {
 
   // Versions
-  val bndVersion = "5.1.2"
+  val bndVersion = "6.4.0"
   val specs2Version = "4.10.3"
 
   // Libraries
@@ -17,5 +17,5 @@ object Dependencies {
 
   val sbtOsgi = List(
     bndLib,
-    specs2 % "test")
+    specs2 % Test)
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.9.6

project/plugins.sbt

@@ -1,5 +1,3 @@
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.0")
-
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
-
-libraryDependencies += ("org.scala-sbt" %% "scripted-plugin" % sbtVersion.value)
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.18.0")

src/main/scala/com/typesafe/sbt/osgi/Osgi.scala

@@ -44,7 +44,8 @@ private object Osgi {
     failOnUndecidedPackage: Boolean,
     sourceDirectories: Seq[File],
     packageOptions: scala.Seq[sbt.PackageOption],
-    streams: TaskStreams): File = {
+    streams: TaskStreams,
+    useJVMJar: Boolean): File = {
     val builder = new Builder
 
     if (failOnUndecidedPackage) {
@@ -75,7 +76,23 @@ private object Osgi {
     val log = streams.log
     builder.getWarnings.asScala.foreach(s => log.warn(s"bnd: $s"))
     builder.getErrors.asScala.foreach(s => log.error(s"bnd: $s"))
-    jar.write(tmpArtifactPath)
+
+    if (!useJVMJar) jar.write(tmpArtifactPath)
+    else {
+      val tmpArtifactDirectoryPath = file(artifactPath.absolutePath + "_tmpdir")
+      IO.delete(tmpArtifactDirectoryPath)
+      tmpArtifactDirectoryPath.mkdirs()
+
+      val manifest = jar.getManifest
+      jar.writeFolder(tmpArtifactDirectoryPath)
+
+      def content =
+        sbt.Path.contentOf(tmpArtifactDirectoryPath).filterNot { case (_, p) => p == "META-INF/MANIFEST.MF" }
+
+      IO.jar(content, tmpArtifactPath, manifest)
+      IO.delete(tmpArtifactDirectoryPath)
+    }
+
     IO.move(tmpArtifactPath, artifactPath)
     artifactPath
   }

src/main/scala/com/typesafe/sbt/osgi/OsgiKeys.scala

@@ -103,6 +103,10 @@ object OsgiKeys {
     SettingKey[Boolean](prefix("FailOnUndecidedPackage"), "Fail the build if a package is neither exported or private." +
       "Without this setting such classes might be just transparently removed from the resulting artifact!")
 
+  val packageWithJVMJar: SettingKey[Boolean] =
+    SettingKey[Boolean](prefix("PackageWithJVMJar"), "Use the JVM jar tools to craft the bundle instead of the one from BND." +
+      "Without this setting the produced bundle are detected as corrupted by recent JVMs")
+
   private def prefix(key: String) = "osgi" + key
 
 }

src/main/scala/com/typesafe/sbt/osgi/SbtOsgi.scala

@@ -52,7 +52,8 @@ object SbtOsgi extends AutoPlugin {
         failOnUndecidedPackage.value,
         (sourceDirectories in Compile).value,
         (packageOptions in (Compile, packageBin)).value,
-        streams.value),
+        streams.value,
+        packageWithJVMJar.value),
       Compile / sbt.Keys.packageBin := bundle.value,
       manifestHeaders := OsgiManifestHeaders(
         bundleActivator.value,
@@ -85,6 +86,7 @@ object SbtOsgi extends AutoPlugin {
       requireCapability := Osgi.requireCapabilityTask(),
       additionalHeaders := Map.empty,
       embeddedJars := Nil,
-      explodedJars := Nil)
+      explodedJars := Nil,
+      packageWithJVMJar := false)
   }
 }