Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: scala-ide/scala-ide
...
head fork: scala-ide/scala-ide
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Commits on Sep 11, 2012
@dragos dragos 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.
f6ab297
View
1  org.scala-ide.sdt.core/.classpath
@@ -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"/>
View
17 org.scala-ide.sdt.core/pom.xml
@@ -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>
View
17 org.scala-ide.sdt.core/src-2.10/scala/tools/eclipse/SymbolsCompatibility.scala
@@ -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 {
-
- }
-
-}
View
10 org.scala-ide.sdt.core/src-2.9/scala/tools/eclipse/SymbolsCompatibility.scala
@@ -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 =>
-
-}
View
3  org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPresentationCompiler.scala
@@ -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

No commit comments for this range

Something went wrong with that request. Please try again.