Permalink
Browse files

Getting a bit closer to having the trunk build running. Still fails b…

…ecause of the 'scala.reflect' split package (exported both from scala.library and scala.compiler). Will investigate later tonight.
  • Loading branch information...
1 parent 962a80b commit 831b7c9acd0f2b939562d1a83fa63171865f0a9a @dragos dragos committed May 19, 2011
Showing with 3 additions and 3 deletions.
  1. +2 −2 org.scala-ide.scala.compiler/pom.xml
  2. +1 −1 org.scala-ide.scala.library/pom.xml
View
4 org.scala-ide.scala.compiler/pom.xml
@@ -124,11 +124,11 @@
<Bundle-Version>${version.number}${maintenance.suffix}${patch.level.suffix}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.tools.*;version=${version.number},ch.epfl.lamp.*;version=${version.number}</_exportcontents>
+ <_exportcontents>scala.reflect.internal.*;version=${version.number},scala.tools.*;version=${version.number},ch.epfl.lamp.*;version=${version.number}</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>
- <Import-Package>!jline.*,!scala.tools.jline.*,!sun.misc,*</Import-Package>
+ <Import-Package>!jline.*,!scala.tools.jline.*,!sun.misc,scala.reflect,*</Import-Package>
</instructions>
</configuration>
</plugin>
View
2 org.scala-ide.scala.library/pom.xml
@@ -138,7 +138,7 @@
<Bundle-Version>${version.number}${patch.level.suffix}</Bundle-Version>
<Bundle-Vendor>scala-ide.org</Bundle-Vendor>
<Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
- <_exportcontents>scala.*;version=${version.number}</_exportcontents>
+ <_exportcontents>scala.reflect,scala.*;version=${version.number}</_exportcontents>
<Embed-Directory>lib</Embed-Directory>
<Embed-StripVersion>true</Embed-StripVersion>
<Include-Resource>lib=${project.build.directory}/lib</Include-Resource>

0 comments on commit 831b7c9

Please sign in to comment.