Permalink
Browse files

Revert "Added support for code specific to 2.9 or 2.10"

..in order to be able to build against 2.10.0-M7.

This reverts commit c4e3088.
  • Loading branch information...
dragos committed Sep 11, 2012
1 parent 68d5484 commit f6ab297e22ee4ca5ebb3f987fb9282dc6d9c8469
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src"/>
- <classpathentry kind="src" path="src-2.9"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
@@ -83,23 +83,6 @@
</execution>
</executions>
</plugin>
- <!-- added source folder containing the code specific to the scala version -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals><goal>add-source</goal></goals>
- <configuration>
- <sources>
- <source>src-${scala.major.minor.version}</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
@@ -1,17 +0,0 @@
-package scala.tools.eclipse
-
-import scala.reflect.internal.Symbols
-
-/**
- * Trait used to keep 2.9-2.10 source compatibility
- */
-trait SymbolsCompatibility { self: Symbols =>
-
- /**
- * This class as been removed in 2.10, but we need its real implementation in 2.9
- */
- case class InvalidCompanions(sym1: Symbol, sym2: Symbol) extends Throwable {
-
- }
-
-}
@@ -1,10 +0,0 @@
-package scala.tools.eclipse
-
-import scala.tools.nsc.symtab.Symbols
-
-/**
- * Trait used to keep 2.9-2.10 source compatibility
- */
-trait SymbolsCompatibility { self: Symbols =>
-
-}
@@ -41,8 +41,7 @@ class ScalaPresentationCompiler(project: ScalaProject, settings: Settings)
with JavaSig
with JVMUtils
with LocateSymbol
- with HasLogger
- with SymbolsCompatibility { self =>
+ with HasLogger { self =>
def presentationReporter = reporter.asInstanceOf[ScalaPresentationCompiler.PresentationReporter]
presentationReporter.compiler = this

0 comments on commit f6ab297

Please sign in to comment.