From 0aae63fbb12b56b97818ce08f4be75ee7bc28fa4 Mon Sep 17 00:00:00 2001
From: zaneli <shun.otani@gmail.com>
Date: Sun, 27 Dec 2015 23:51:17 +0900
Subject: [PATCH] Update Scala version to 2.10.6

---
 .travis.yml         | 16 ++++++++--------
 project/Build.scala |  4 ++--
 sbt                 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc414c5365..a9a5a1ec11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
 matrix:
   include:
 #BASE TESTS
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-args scalding-date maple"
       script: "scripts/run_test.sh"
 
@@ -22,7 +22,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-args scalding-date maple"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-avro scalding-hraven scalding-commons scalding-parquet scalding-parquet-scrooge"
       script: "scripts/run_test.sh"
 
@@ -30,7 +30,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-avro scalding-hraven scalding-commons scalding-parquet scalding-parquet-scrooge"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-core scalding-jdbc scalding-json scalding-db"
       script: "scripts/run_test.sh"
 
@@ -38,7 +38,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-core scalding-jdbc scalding-json scalding-db"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-hadoop-test"
       script: "scripts/run_test.sh"
 
@@ -46,7 +46,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-hadoop-test"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-serialization"
       script: "scripts/run_test.sh"
 
@@ -54,7 +54,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-serialization"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="base" TEST_TARGET="scalding-thrift-macros"
       script: "scripts/run_test.sh"
 
@@ -62,7 +62,7 @@ matrix:
       env: BUILD="base" TEST_TARGET="scalding-thrift-macros"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="test tutorials and matrix tutorials and repl" TEST_TARGET="scalding-repl"
       script:
       - "scripts/run_test.sh"
@@ -80,7 +80,7 @@ matrix:
       - "scripts/build_assembly_no_test.sh scalding-assembly"
       - "scripts/test_matrix_tutorials.sh"
 
-    - scala: 2.10.5
+    - scala: 2.10.6
       env: BUILD="test repl and typed tutorials"
       script:
       - "scripts/build_assembly_no_test.sh scalding-repl"
diff --git a/project/Build.scala b/project/Build.scala
index 0bb5dbf671..aaca3beb31 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -51,9 +51,9 @@ object ScaldingBuild extends Build {
   val sharedSettings = Project.defaultSettings ++ assemblySettings ++ scalariformSettings ++ Seq(
     organization := "com.twitter",
 
-    scalaVersion := "2.10.5",
+    scalaVersion := "2.10.6",
 
-    crossScalaVersions := Seq("2.10.5", "2.11.7"),
+    crossScalaVersions := Seq("2.10.6", "2.11.7"),
 
     ScalariformKeys.preferences := formattingPreferences,
 
diff --git a/sbt b/sbt
index d894a15209..c63ba8279a 100755
--- a/sbt
+++ b/sbt
@@ -105,7 +105,7 @@ declare -r default_jvm_opts_common="-Xms512m -Xmx1536m -Xss2m $jit_opts $cms_opt
 declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
 declare -r latest_28="2.8.2"
 declare -r latest_29="2.9.3"
-declare -r latest_210="2.10.5"
+declare -r latest_210="2.10.6"
 declare -r latest_211="2.11.7"
 
 declare -r script_path="$(get_script_path "$BASH_SOURCE")"