Skip to content

Commit

Permalink
upgrade bnd to 2.4.1, required java version in bnd files
Browse files Browse the repository at this point in the history
  • Loading branch information
lrytz committed Jun 30, 2015
1 parent d5aa6b5 commit f257f66
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ TODO:
<mkdir dir="${user.home}/.m2/repository"/>
<!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
<artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
<dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
<dependency groupId="biz.aQute.bnd" artifactId="bnd" version="2.4.0"/>
</artifact:dependencies>

<artifact:dependencies pathId="jarjar.classpath">
Expand Down
2 changes: 1 addition & 1 deletion src/build/bnd/scala-compiler-doc.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @SCALA_COMPILER_DOC_VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-compiler-interactive.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @SCALA_COMPILER_INTERACTIVE_VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-compiler.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Import-Package: jline.*;resolution:=optional, \
scala.xml.*;version="${range;[====,====];@XML_VERSION@}";resolution:=optional, \
scala.*;version="${range;[==,=+);${ver}}", \
*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-library.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: sun.misc;resolution:=optional, *
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-parser-combinators.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @PARSER_COMBINATORS_VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-reflect.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);${ver}}", \
scala.tools.nsc;resolution:=optional;version="${range;[==,=+);${ver}}", \
*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-swing.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @SCALA_SWING_VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2 changes: 1 addition & 1 deletion src/build/bnd/scala-xml.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ver: @XML_VERSION@
Bundle-Version: ${ver}
Export-Package: *;version=${ver}
Import-Package: scala.*;version="${range;[==,=+);@VERSION@}",*
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

0 comments on commit f257f66

Please sign in to comment.