Skip to content

2.12 support #24

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 23, 2014
Merged

2.12 support #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05ba204
Sets bundle versions 0.1.6-SNAPSHOT
Jun 10, 2014
a106e1f
Adds a profile for Scala 2.12
Jun 20, 2014
c1f82e7
Makes the dependency to the scala-xml bundle, not the package
Jun 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,19 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>scala-2.12.x</id>
<properties>
<scala.version>2.12.0-SNAPSHOT</scala.version>
<version.suffix>2_12</version.suffix>
</properties>
<dependencies>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
<version>${scala.xml.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion scalariform.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="scalariform.feature"
label="Scalariform"
version="0.1.5">
version="0.1.6.qualifier">

<description>
Code formatter for Scala 2.8
Expand Down
6 changes: 3 additions & 3 deletions scalariform/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Scalariform
Bundle-SymbolicName: scalariform
Bundle-Version: 0.1.5
Require-Bundle: org.scala-lang.scala-library
Import-Package: scala.xml.parsing
Bundle-Version: 0.1.6.qualifier
Require-Bundle: org.scala-lang.scala-library,
org.scala-lang.modules.scala-xml
Bundle-ClassPath: .
Export-Package: scalariform,
scalariform.astselect,
Expand Down