+pro #15870 OSGi headers for experimental Streams and HTTP modules #17979
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -432,10 +432,12 @@ object AkkaBuild extends Build { | |
| lazy val httpXml = | ||
| httpMarshallersScalaSubproject("xml") | ||
| .settings(Dependencies.httpXml) | ||
| .settings(OSGi.httpXml: _*) | ||
|
|
||
| lazy val httpSprayJson = | ||
| httpMarshallersScalaSubproject("spray-json") | ||
| .settings(Dependencies.httpSprayJson) | ||
| .settings(OSGi.httpSprayJson: _*) | ||
|
|
||
| def httpMarshallersScalaSubproject(name: String) = | ||
| Project( | ||
|
|
@@ -459,6 +461,7 @@ object AkkaBuild extends Build { | |
| lazy val httpJackson = | ||
| httpMarshallersJavaSubproject("jackson") | ||
| .settings(Dependencies.httpJackson) | ||
| .settings(OSGi.httpJackson: _*) | ||
|
|
||
| def httpMarshallersJavaSubproject(name: String) = | ||
| Project( | ||
|
|
@@ -546,7 +549,7 @@ object AkkaBuild extends Build { | |
| id = "akka-stream-testkit-experimental", | ||
| base = file("akka-stream-testkit"), | ||
| dependencies = Seq(stream), | ||
| settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ experimentalSettings ++ javadocSettings ++ OSGi.streamTestkit ++ Seq( | ||
| version := streamAndHttpVersion, | ||
| libraryDependencies ++= Dependencies.streamTestkit, | ||
| previousArtifact := None | ||
|
|
@@ -1382,16 +1385,43 @@ object AkkaBuild extends Build { | |
|
|
||
| val cluster = exports(Seq("akka.cluster.*"), imports = Seq(protobufImport())) | ||
|
|
||
| val parsing = exports(Seq("akka.parboiled2.*", "akka.shapeless.*"), | ||
| imports = Seq(optionalResolution("scala.quasiquotes"))) | ||
|
|
||
| val httpCore = exports(Seq("akka.http.*"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.parboiled2.*"), | ||
| streamAndHttpImport("akka.shapeless.*"))) | ||
|
|
||
| val http = exports(Seq("akka.http.impl.server", | ||
| "akka.http.scaladsl.server.*", "akka.http.javadsl.server.*", | ||
| "akka.http.scaladsl.client", "akka.http.scaladsl.coding", "akka.http.scaladsl.common", | ||
| "akka.http.scaladsl.marshalling", "akka.http.scaladsl.unmarshalling"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.http.*"), | ||
| streamAndHttpImport("akka.parboiled2.*"))) | ||
|
|
||
| val httpTestKit = exports(Seq("akka.http.scaladsl.testkit.*", "akka.http.javaadsl.testkit.*"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.http.*"))) | ||
|
|
||
| val httpSprayJson = exports(Seq("akka.http.scaladsl.marshallers.sprayjson"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.http.*"))) | ||
|
|
||
| val httpXml = exports(Seq("akka.http.scaladsl.marshallers.xml"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.http.*"))) | ||
|
|
||
| val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"), | ||
| streamAndHttpImport("akka.http.*"))) | ||
|
|
||
| val stream = exports(Seq("akka.stream.*")) | ||
|
|
||
| val streamTestkit = exports(Seq("akka.stream.testkit.*"), | ||
| imports = Seq(streamAndHttpImport("akka.stream.*"))) | ||
|
|
||
| val fileMailbox = exports(Seq("akka.actor.mailbox.filebased.*")) | ||
|
|
||
| val mailboxesCommon = exports(Seq("akka.actor.mailbox.*"), imports = Seq(protobufImport())) | ||
|
|
@@ -1428,11 +1458,17 @@ object AkkaBuild extends Build { | |
| "com.google.protobuf") | ||
|
|
||
| def exports(packages: Seq[String] = Seq(), imports: Seq[String] = Nil) = osgiSettings ++ Seq( | ||
| OsgiKeys.importPackage := imports, | ||
| OsgiKeys.importPackage <++= scalaVersion { v => | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. Are you sure this change is at the right place? This will add There was a problem hiding this comment. @jrudolph no worries, BND is smart and will add it to @ktoso should I change the condition to |
||
| if (v.startsWith("2.10.")) Nil | ||
| else Seq(versionedImport("scala.xml.*", "1.0", "1.1")) | ||
| }, | ||
| OsgiKeys.importPackage ++= defaultImports, | ||
| OsgiKeys.exportPackage := packages | ||
| ) | ||
| def defaultImports = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(), "*") | ||
| def akkaImport(packageName: String = "akka.*") = versionedImport(packageName, "2.3", "2.4") | ||
| def streamAndHttpImport(packageName: String) = versionedImport(packageName, "1.0", "1.1") | ||
| def configImport(packageName: String = "com.typesafe.config.*") = versionedImport(packageName, "1.2.0", "1.3.0") | ||
| def protobufImport(packageName: String = "com.google.protobuf.*") = versionedImport(packageName, "2.5.0", "2.6.0") | ||
| def scalaImport(packageName: String = "scala.*") = versionedImport(packageName, s"$scalaEpoch.$scalaMajor", s"$scalaEpoch.${scalaMajor+1}") | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
excellent, thanks @rkrzewski
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bam!
javaadslspoiled the show. Hard to spot, though...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aaaaargh :<
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry about that :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries about that, this is so easy to get wrong. The problem is that there are no safeguards that would catch a problem like this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, no worries - I mean, I reviewed and looked at this exact line and still missed the typo.
Will be fixed soon in 1.1 tho
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, shouldn't the script written by @2m have detected this problem?
Also, the verification script should check that the generated jar does not contain more classes than
target/classesfolder, because it's easy to accidentally re-export packages from an upstream dependency if a too broad Export declaration is used (which is completely valid, and occasionally useful in OSGi environment)