Update sbt-osgi to 0.10.0 #1063
Conversation
mdedetrich
requested review from
jrudolph,
gmethvin,
He-Pin,
nvollmar,
seglo,
pjfanning and
jxnu-liguobin
|
@Roiocam If you want to have a look as well |
| @@ -467,6 +470,7 @@ lazy val testkit = pekkoModule("testkit") | |||
| .settings(AutomaticModuleName.settings("pekko.actor.testkit")) | |||
| .settings(OSGi.testkit) | |||
| .settings(initialCommands += "import org.apache.pekko.testkit._") | |||
| .enablePlugins(SbtOsgi) | |||
There was a problem hiding this comment.
It's inherited from the parent project. Note that if it's not done correctly the sbt build won't even load.
The solution is quote simple, whoever OSGi settings were used we now need to enable the plugin explicitly, nothing more or less.
There was a problem hiding this comment.
Also the tests should not have OSGi enabled anyways, OSGi is about packaging the final jar and we don't package tests
|
|
||
| lazy val streamTestkit = pekkoModule("stream-testkit") | ||
| .dependsOn(stream, testkit % "compile->compile;test->test") | ||
| .settings(Dependencies.streamTestkit) | ||
| .settings(AutomaticModuleName.settings("pekko.stream.testkit")) | ||
| .settings(OSGi.streamTestkit) | ||
| .enablePlugins(SbtOsgi) |
|
Before we can merge this, we should validate the Java 9 related classes is rightly been generated |
Agreed @Roiocam Do you want to do this since you did it last time. There shouldn't be any issue since this specific issue is pretty black and white (i.e. either sbt loads or it doesn't) but its better to be safe than sorry (again). |
There was a problem hiding this comment.
LGTM, Thanks.
I have verified this PR with #1065 both (Compile / packageBin) and (OsgiKeys.bundle), it won't break the JDK9 plugin.
pekko > jdk9Check
Package check depend on ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,actor-typed) / List(ScopedKey(Scope(Select(ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,actor-typed)), Zero, Zero, Zero),osgiBundle))
Package check depend on ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,cluster-sharding) / List(ScopedKey(Scope(Select(ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,cluster-sharding)), Zero, Zero, Zero),osgiBundle))
Package check depend on ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,remote) / List(ScopedKey(Scope(Select(ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,remote)), Zero, Zero, Zero),osgiBundle))
Package check depend on ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,stream) / List(ScopedKey(Scope(Select(ProjectRef(file:/Users/roiocam/IdeaProject/incubator-pekko/,stream)), Zero, Zero, Zero),osgiBundle))
This PR brings in the latest version of sbt-osgi. Aside from the package name being changed, of note is that since the initialization of keys was properly fixed in sbt/sbt-osgi#121 we now have to correctly enable the
SbtOsgiplugin on the projects that actually use sbt-osgi.The reason why this wasn't needed previously is that keys was being inadvertently initialized without initialising the SbtOsgi plugin as documented because the incorrect keys was being put into
projectSettingsand we were referencing them inOSGiobject.