Upgrade Scala version to 2.10.2.

Samuelseggs · Jul 26, 2013 · 6a3d9b4 · 6a3d9b4
1 parent d93862d
commit 6a3d9b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml
diff --git a/OpenCV2_Cookbook/OpenCV2_Cookbook.iml b/OpenCV2_Cookbook/OpenCV2_Cookbook.iml
@@ -4,7 +4,7 @@
     <facet type="scala" name="Scala">
       <configuration>
         <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="Maven: org.scala-lang:scala-compiler-bundle:2.10.1" />
+        <option name="compilerLibraryName" value="Maven: org.scala-lang:scala-compiler-bundle:2.10.2" />
         <option name="fsc" value="true" />
         <option name="vmOptions" value="" />
       </configuration>
@@ -24,8 +24,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.googlecode.javacv:javacv:linux-x86:0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.10.1" level="project" />
-    <orderEntry type="library" name="Maven: org.scala-lang:scala-swing:2.10.1" level="project" />
+    <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.10.2" level="project" />
+    <orderEntry type="library" name="Maven: org.scala-lang:scala-swing:2.10.2" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.javacpp:javacpp:0.5" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.javacv:javacv:0.5" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.javacv:javacv:windows-x86_64:0.5" level="project" />

diff --git a/OpenCV2_Cookbook/pom.xml b/OpenCV2_Cookbook/pom.xml
@@ -26,7 +26,7 @@
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
         <encoding>UTF-8</encoding>
-        <scala.version>2.10.1</scala.version>
+        <scala.version>2.10.2</scala.version>
         <javacpp.version>0.5</javacpp.version>
         <javacv.version>0.5</javacv.version>
         <platform.name>${os.name}-${os.arch}</platform.name>