Permalink
Browse files

bumped default scala version 2.9.x -> 2.10.x

  • Loading branch information...
1 parent 79591cb commit cd255e6a6bba25bb2308b2092d9215dc083e3e5c @huitseeker huitseeker committed Jan 22, 2013
Showing with 27 additions and 24 deletions.
  1. +1 −2 build-all.sh
  2. +17 −17 org.scala-ide.sbt.full.library/.classpath
  3. +1 −1 org.scala-ide.sdt.core/.classpath
  4. +8 −4 pom.xml
View
@@ -10,7 +10,7 @@ ROOT_DIR=${PWD}
if [ -z "$*" ]
then
- ARGS="-P scala-2.9.x clean install"
+ ARGS="-P scala-2.10.x clean install"
else
ARGS="$*"
fi
@@ -60,4 +60,3 @@ if [ ${RES} != 0 ]
then
exit ${RES}
fi
-
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/api_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/classfile_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/classpath_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compile_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compiler-integration_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/compiler-interface_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/control_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/incremental-compiler_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/interface_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/io_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jline.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/logging_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/persist_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/process_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/relation_2.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/sbinary_2.9.2.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry exported="true" kind="lib" path="lib/jline.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/api_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/classfile_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/classpath_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/compile_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/compiler-integration_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/compiler-interface_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/control_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/incremental-compiler_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/interface_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/io_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/logging_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/persist_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/process_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/relation_2.10.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/sbinary_2.10.0.jar"/>
+ <classpathentry kind="output" path="classes"/>
</classpath>
@@ -1,7 +1,7 @@
<?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="src" path="src-2.10"/>
<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
12 pom.xml
@@ -56,11 +56,11 @@
<repo.ajdt>${repo.ajdt.indigo}</repo.ajdt>
<!-- default values, can be overwritten by profiles -->
- <scala.version>2.9.3-SNAPSHOT</scala.version>
- <scala.era.major.version>2.9</scala.era.major.version>
+ <scala.version>2.10.0</scala.version>
+ <scala.era.major.version>2.10</scala.era.major.version>
<scala.library.version>${scala.version}</scala.library.version>
<sbt.compiled.version>${scala.version}</sbt.compiled.version>
- <version.suffix>2_09</version.suffix>
+ <version.suffix>2_10</version.suffix>
<version.tag>local</version.tag>
<!-- the repos containing the Scala dependencies -->
@@ -75,6 +75,10 @@
<!--- the profile using the default values. Scala 2.9.x -->
<id>scala-2.9.x</id>
<properties>
+ <scala.version>2.9.3-SNAPSHOT</scala.version>
+ <scala.era.major.version>2.9</scala.era.major.version>
+ <version.suffix>2_09</version.suffix>
+
<repo.scala-refactoring>${repo.scala-ide.root}/scala-refactoring-29x</repo.scala-refactoring>
<repo.scalariform>${repo.scala-ide.root}/scalariform-29x</repo.scalariform>
<repo.typesafe>http://repo.typesafe.com/typesafe/ide-2.9</repo.typesafe>
@@ -106,7 +110,7 @@
<repo.typesafe>http://repo.typesafe.com/typesafe/ide-2.11</repo.typesafe>
</properties>
</profile>
-
+
<profile>
<!-- Eclipse Juno -->
<id>eclipse-juno</id>

0 comments on commit cd255e6

Please sign in to comment.