Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added new build profile for Scala 2.11
Note that the p2 repo's name of both scalariform and scala-refactoring contain now the Scala major version they have been compiled with. Doing so will make our life easier in the future ("trunk" is a moving target, we need a stable identifier). Also, since minor Scala releases are binary compatible, it should be ok to use scalariform and scala-refactoring compiled against Scala 2.10.0 also for building the IDE for Scala 2.10.1. The changes in org.scala-ide.scala.compiler/pom.xml needed to support Scala 2.11.x are exact duplicates of what we do for Scala 2.10.x. Unfortunately, it doesn't seem to be possible to avoid the duplication because of Maven limitations (e.g., http://jira.codehaus.org/browse/MNG-3328). Furthermore, consider that once we drop support for Scala 2.9.x, then we will no longer need to have the above mentioned duplication. Re #1001256
- Loading branch information
Showing
11 changed files
with
101 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...dt.core.tests/test-workspace/classpath/lib/2.10.x/binary-scala-library/library.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# To test library with a 2.9.x version number | ||
# To test library with a 2.10.x version number | ||
|
||
version.number=2.10.x | ||
copyright.string=Copyright 2002-2011, LAMP/EPFL |
3 changes: 3 additions & 0 deletions
3
....core.tests/test-workspace/classpath/lib/2.11.x/binary-scala-library/META-INF/MANIFEST.MF
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Manifest-Version: 1.0 | ||
Created-By: 1.6.0_26 (Apple Inc.) | ||
|
4 changes: 4 additions & 0 deletions
4
...dt.core.tests/test-workspace/classpath/lib/2.11.x/binary-scala-library/library.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# To test library with a 2.11.x version number | ||
|
||
version.number=2.11.x | ||
copyright.string=Copyright 2002-2011, LAMP/EPFL |
Binary file added
BIN
+255 Bytes
...dt.core.tests/test-workspace/classpath/lib/2.11.x/binary-scala-library/scala/Predef.class
Binary file not shown.
Binary file added
BIN
+971 Bytes
org.scala-ide.sdt.core.tests/test-workspace/classpath/lib/2.11.x/my-scala-library.jar
Binary file not shown.
Binary file added
BIN
+971 Bytes
org.scala-ide.sdt.core.tests/test-workspace/classpath/lib/2.11.x/scala-library.jar
Binary file not shown.
17 changes: 17 additions & 0 deletions
17
org.scala-ide.sdt.core/src-2.11/scala/tools/eclipse/SymbolsCompatibility.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package scala.tools.eclipse | ||
|
||
import scala.reflect.internal.Symbols | ||
|
||
/** | ||
* Trait used to keep 2.9/2.10/2.11 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 { | ||
|
||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters