Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix OSGi headers #226

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Fix OSGi headers #226

merged 1 commit into from
Jun 25, 2019

Conversation

szeiger
Copy link
Contributor

@szeiger szeiger commented Jun 24, 2019

This combines #225 with version-dependent exports and proper imports.

- Export all our packages (fixes scala#224)
- Import the correct standard library version
  (using code from https://github.com/slick/slick/blob/master/project/Osgi.scala)
- No private packages needed
@szeiger
Copy link
Contributor Author

szeiger commented Jun 24, 2019

2.12 manifest:

Manifest-Version: 1.0
Bnd-LastModified: 1561378400281
Bundle-Description: scala-collection-compat
Bundle-License: https://www.apache.org/licenses/LICENSE-2.0;descriptio
 n=Apache-2.0
Bundle-ManifestVersion: 2
Bundle-Name: scala-collection-compat
Bundle-SymbolicName: org.scala-lang.modules.scala-collection-compat
Bundle-Vendor: org.scala-lang.modules
Bundle-Version: 0.1.0.SNAPSHOT
Created-By: 1.8.0_172 (Oracle Corporation)
Export-Package: scala.collection.compat;version="0.1.0.SNAPSHOT";uses:
 ="scala,scala.collection,scala.collection.generic,scala.collection.im
 mutable,scala.collection.mutable,scala.math,scala.reflect,scala.runti
 me",scala.collection.compat.immutable;version="0.1.0.SNAPSHOT";uses:=
 "scala,scala.collection,scala.collection.generic,scala.collection.imm
 utable,scala.collection.mutable,scala.collection.parallel,scala.colle
 ction.parallel.immutable,scala.reflect,scala.runtime",scala.jdk;versi
 on="0.1.0.SNAPSHOT";uses:="scala.collection,scala.collection.concurre
 nt,scala.collection.convert,scala.collection.mutable,scala.reflect"
Implementation-Title: scala-collection-compat
Implementation-URL: http://www.scala-lang.org/
Implementation-Vendor: org.scala-lang.modules
Implementation-Vendor-Id: org.scala-lang.modules
Implementation-Version: 0.1.0-SNAPSHOT
Import-Package: scala;version="[2.12,2.13)",scala.collection;version="
 [2.12,2.13)",scala.collection.concurrent;version="[2.12,2.13)",scala.
 collection.convert;version="[2.12,2.13)",scala.collection.generic;ver
 sion="[2.12,2.13)",scala.collection.immutable;version="[2.12,2.13)",s
 cala.collection.mutable;version="[2.12,2.13)",scala.collection.parall
 el;version="[2.12,2.13)",scala.collection.parallel.immutable;version=
 "[2.12,2.13)",scala.math;version="[2.12,2.13)",scala.reflect;version=
 "[2.12,2.13)",scala.runtime;version="[2.12,2.13)",scala.util.hashing;
 version="[2.12,2.13)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Specification-Title: scala-collection-compat
Specification-Vendor: org.scala-lang.modules
Specification-Version: 0.1.0-SNAPSHOT
Tool: Bnd-4.0.0.201805111645

2.13 manifest:

Manifest-Version: 1.0
Bnd-LastModified: 1561378291805
Bundle-Description: scala-collection-compat
Bundle-License: https://www.apache.org/licenses/LICENSE-2.0;descriptio
 n=Apache-2.0
Bundle-ManifestVersion: 2
Bundle-Name: scala-collection-compat
Bundle-SymbolicName: org.scala-lang.modules.scala-collection-compat
Bundle-Vendor: org.scala-lang.modules
Bundle-Version: 0.1.0.SNAPSHOT
Created-By: 1.8.0_172 (Oracle Corporation)
Export-Package: scala.collection.compat;version="0.1.0.SNAPSHOT";uses:
 ="scala.collection,scala.reflect",scala.collection.compat.immutable;v
 ersion="0.1.0.SNAPSHOT";uses:="scala.collection.immutable,scala.refle
 ct"
Implementation-Title: scala-collection-compat
Implementation-URL: http://www.scala-lang.org/
Implementation-Vendor: org.scala-lang.modules
Implementation-Vendor-Id: org.scala-lang.modules
Implementation-Version: 0.1.0-SNAPSHOT
Import-Package: scala.collection;version="[2.13,2.14)",scala.collectio
 n.immutable;version="[2.13,2.14)",scala.reflect;version="[2.13,2.14)"
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
Specification-Title: scala-collection-compat
Specification-Vendor: org.scala-lang.modules
Specification-Version: 0.1.0-SNAPSHOT
Tool: Bnd-4.0.0.201805111645

Copy link
Member

@dwijnand dwijnand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trust you're right

Copy link
Contributor

@NthPortal NthPortal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What Dale said

@NthPortal NthPortal mentioned this pull request Jun 24, 2019
@dwijnand dwijnand merged commit d60782e into scala:master Jun 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

scala.jdk package isn't published
3 participants