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

Use latest sbt-osgi

Browse source
This commit is contained in:
Matthew de Detrich 2024-01-09 20:54:13 +11:00 • committed by Matthew de Detrich
parent 959c98dba5
commit b9d2cc6187
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.scala-steward.conf
View file

@ -18,8 +18,6 @@ updates.ignore = [
{ groupId = "com.lightbend.paradox", artifactId = "sbt-paradox-project-info" }
{ groupId = "com.lightbend.paradox", artifactId = "sbt-paradox "}
{ groupId = "com.typesafe", artifactId = "ssl-config-core" }
{ groupId = "com.typesafe.sbt", artifactId = "sbt-osgi" }
{ groupId = "com.github.sbt", artifactId = "sbt-osgi" }
{ groupId = "org.agrona", artifactId = "agrona" }
{ groupId = "org.mockito", artifactId = "mockito-core" }
{ groupId = "com.lightbend.sbt", artifactId = "sbt-java-formatter" }

9
project/OSGi.scala
View file

@ -15,6 +15,7 @@ import com.typesafe.sbt.osgi.OsgiKeys
import com.typesafe.sbt.osgi.SbtOsgi._
import sbt._
import sbt.Keys._
import sbtassembly.AssemblyKeys.assembly
import net.bzzt.reproduciblebuilds.ReproducibleBuildsPlugin
object OSGi {
@ -80,7 +81,13 @@ object OSGi {
configImport(),
"*"),
OsgiKeys.exportPackage := Seq("org.apache.pekko.protobufv3.internal.*"),
OsgiKeys.privatePackage := Seq("google.protobuf.*"))
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))
val jackson = exports(Seq("org.apache.pekko.serialization.jackson.*"))

2
project/plugins.sbt
View file

@ -13,7 +13,7 @@ addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.4-INVALID-CEN-JAR-PATCH")
addSbtPlugin("com.github.sbt" % "sbt-osgi" % "0.9.10")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")