Browse files

Merge pull request #502 from dragos/fix/cross-compiled-modules-211

Fix/cross compiled modules 211
  • Loading branch information...
2 parents b09a97f + 99d87bb commit 47e32e9ca6fa82a056019ae5d721665a449d13a4 @dragos dragos committed Aug 21, 2013
Showing with 15 additions and 14 deletions.
  1. +3 −3 org.scala-ide.sbt.full.library/pom.xml
  2. +6 −6 org.scala-ide.scala.library/pom.xml
  3. +6 −5 pom.xml
View
6 org.scala-ide.sbt.full.library/pom.xml
@@ -30,12 +30,12 @@
<id>scala-2.11.x</id>
<dependencies>
<dependency>
- <groupId>org.scala-lang</groupId>
+ <groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-parser-combinators</artifactId>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
</profile>
View
12 org.scala-ide.scala.library/pom.xml
@@ -23,12 +23,12 @@
<id>scala-2.11.x</id>
<dependencies>
<dependency>
- <groupId>org.scala-lang</groupId>
+ <groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-parser-combinators</artifactId>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
<build>
@@ -47,15 +47,15 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.scala-lang</groupId>
+ <groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-xml-src.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-parser-combinators</artifactId>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
<classifier>sources</classifier>
<type>jar</type>
<destFileName>scala-parser-combinators-src.jar</destFileName>
View
11 pom.xml
@@ -56,7 +56,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.xml.version>1.0-RC2</scala.xml.version>
+ <scala.parser-combinators.version>1.0-RC1</scala.parser-combinators.version>
<scala.library.version>${scala.version}</scala.library.version>
<version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
@@ -355,14 +356,14 @@
<version>${scala.library.version}</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
+ <groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
<version>${scala.xml.version}</version>
</dependency>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-parser-combinators</artifactId>
- <version>${scala.library.version}</version>
+ <groupId>org.scala-lang.modules</groupId>
+ <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+ <version>${scala.parser-combinators.version}</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>

0 comments on commit 47e32e9

Please sign in to comment.