Permalink
Browse files

Switch to cross-compiled versions of Scala modules.

For the moment, only `scala-xml` is cross compiled.
  • Loading branch information...
1 parent de9451c commit 29bb0a4a27f08fd083f4b7419703b8b4b202babc @dragos dragos committed Aug 14, 2013
Showing with 8 additions and 5 deletions.
  1. +1 −1 org.scala-ide.sbt.full.library/pom.xml
  2. +2 −2 org.scala-ide.scala.library/pom.xml
  3. +5 −2 pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-xml</artifactId>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -24,7 +24,7 @@
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-xml</artifactId>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -48,7 +48,7 @@
<artifactItems>
<artifactItem>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-xml</artifactId>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-xml-src.jar</destFileName>
View
@@ -54,6 +54,8 @@
<!-- default values, can be overwritten by profiles -->
<scala.version>2.10.0</scala.version>
+ <scala.binary.version>2.10</scala.binary.version>
+ <scala.xml.version>1.0-RC1</scala.xml.version>
<scala.library.version>${scala.version}</scala.library.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
@@ -84,6 +86,7 @@
<id>scala-2.11.x</id>
<properties>
<scala.version>2.11.0-SNAPSHOT</scala.version>
+ <scala.binary.version>2.11.0-M4</scala.binary.version>
<version.suffix>2_11</version.suffix>
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-211x</repo.scala-refactoring>
@@ -346,8 +349,8 @@
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
- <artifactId>scala-xml</artifactId>
- <version>${scala.library.version}</version>
+ <artifactId>scala-xml_${scala.binary.version}</artifactId>
+ <version>${scala.xml.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>

0 comments on commit 29bb0a4

Please sign in to comment.