Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit f6ab297e22ee4ca5ebb3f987fb9282dc6d9c8469 1 parent 68d5484
Iulian Dragos authored
1  org.scala-ide.sdt.core/.classpath
... ...
@@ -1,7 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <classpath>
3 3
 	<classpathentry kind="src" output="target/classes" path="src"/>
4  
-	<classpathentry kind="src" path="src-2.9"/>
5 4
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
6 5
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/>
7 6
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
17  org.scala-ide.sdt.core/pom.xml
@@ -83,23 +83,6 @@
83 83
           </execution>
84 84
         </executions>
85 85
       </plugin>
86  
-      <!-- added source folder containing the code specific to the scala version -->
87  
-      <plugin>
88  
-        <groupId>org.codehaus.mojo</groupId>
89  
-        <artifactId>build-helper-maven-plugin</artifactId>
90  
-        <version>1.7</version>
91  
-        <executions>
92  
-          <execution>
93  
-            <phase>generate-sources</phase>
94  
-            <goals><goal>add-source</goal></goals>
95  
-            <configuration>
96  
-              <sources>
97  
-                <source>src-${scala.major.minor.version}</source>
98  
-              </sources>
99  
-            </configuration>
100  
-          </execution>
101  
-        </executions>
102  
-      </plugin>
103 86
     </plugins>
104 87
   </build>
105 88
 </project>
17  org.scala-ide.sdt.core/src-2.10/scala/tools/eclipse/SymbolsCompatibility.scala
... ...
@@ -1,17 +0,0 @@
1  
-package scala.tools.eclipse
2  
-
3  
-import scala.reflect.internal.Symbols
4  
-
5  
-/**
6  
- * Trait used to keep 2.9-2.10 source compatibility
7  
- */
8  
-trait SymbolsCompatibility { self: Symbols =>
9  
-
10  
-  /**
11  
-   * This class as been removed in 2.10, but we need its real implementation in 2.9
12  
-   */
13  
-  case class InvalidCompanions(sym1: Symbol, sym2: Symbol) extends Throwable {
14  
-
15  
-  }
16  
-
17  
-}
10  org.scala-ide.sdt.core/src-2.9/scala/tools/eclipse/SymbolsCompatibility.scala
... ...
@@ -1,10 +0,0 @@
1  
-package scala.tools.eclipse
2  
-
3  
-import scala.tools.nsc.symtab.Symbols
4  
-
5  
-/**
6  
- * Trait used to keep 2.9-2.10 source compatibility
7  
- */
8  
-trait SymbolsCompatibility { self: Symbols =>
9  
-
10  
-}
3  org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPresentationCompiler.scala
@@ -41,8 +41,7 @@ class ScalaPresentationCompiler(project: ScalaProject, settings: Settings)
41 41
   with JavaSig
42 42
   with JVMUtils
43 43
   with LocateSymbol
44  
-  with HasLogger
45  
-  with SymbolsCompatibility { self =>
  44
+  with HasLogger { self =>
46 45
 
47 46
   def presentationReporter = reporter.asInstanceOf[ScalaPresentationCompiler.PresentationReporter]
48 47
   presentationReporter.compiler = this

0 notes on commit f6ab297

Please sign in to comment.
Something went wrong with that request. Please try again.