Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix the build for 2.11 #464

Merged
merged 2 commits into from

3 participants

@dragos
Owner

Using @adriaanm's commits, this should fix the build for Scala master (and fix all the failed PR builds once merged).

@dragos
Owner

Unfortunately I didn't realize this breaks the 2.10.x build. I'll follow up with a fix.

@dragos
Owner

retest this please

@dragos
Owner

It seems that git push --force confuses the new bot. I filed a ticket. The validator succeeded.

@skyluc
Owner

LGTM

@dragos dragos merged commit e1bba28 into scala-ide:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 11, 2013
  1. @adriaanm @dragos

    Add scala-xml and scala-parser-combinator dependencies for the 2.11.x…

    adriaanm authored dragos committed
    … profile.
  2. @adriaanm @dragos

    Remove unnecessary xml dependency from test

    adriaanm authored dragos committed
This page is out of date. Refresh to see the latest.
View
20 org.scala-ide.sbt.full.library/pom.xml
@@ -20,6 +20,26 @@
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <!--- the profile using the default values. Scala 2.10.x -->
+ <id>scala-2.10.x</id>
+ </profile>
+ <profile>
+ <!--- the profile using the default values. Scala 2.11.x -->
+ <id>scala-2.11.x</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-parser-combinators</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
View
48 org.scala-ide.scala.library/pom.xml
@@ -31,6 +31,54 @@
<properties>
<scala.library.third-part>scala-actors</scala.library.third-part>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-parser-combinators</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- add the source jar, to be able to attach the source to the Scala container. And the continuation plug-in -->
+ <id>copy.xml</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-xml</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>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ <destFileName>scala-parser-combinators-src.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
View
4 org.scala-ide.sdt.core.tests/test-workspace/builder-errors/src/test/Foo.scala
@@ -1,13 +1,11 @@
package test
-import scala.xml.NodeSeq
-
class Foo {
def competitors() {
List("foo", "bar") match {
case Nil => Nil
case competitors =>
- def bindCompetitors(): scala.xml.NodeSeq =
+ def bindCompetitors(): List[Nothing] =
competitors.flatMap { competitor =>
val l: Int = competitor.length
l.foo.toString
View
10 pom.xml
@@ -224,6 +224,16 @@
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
+ <artifactId>scala-xml</artifactId>
+ <version>${scala.library.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-parser-combinators</artifactId>
+ <version>${scala.library.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
<artifactId>scala-swing</artifactId>
<version>${scala.library.version}</version>
</dependency>
Something went wrong with that request. Please try again.