Merge branch 'develop' into release/0.17.0

twitter · Apr 10, 2017 · d689e97 · d689e97
2 parents c5f07f8 + 5d5dd54
commit d689e97
Show file tree

Hide file tree

Showing 90 changed files with 956 additions and 407 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: scala
-jdk: oraclejdk7
+jdk: oraclejdk8
 sudo: false
 
 before_install:
@@ -27,55 +27,55 @@ addons:
 matrix:
   include:
 #BASE TESTS
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-args scalding-date maple"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-args scalding-date maple"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-avro scalding-hraven scalding-commons scalding-parquet scalding-parquet-scrooge"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-avro scalding-hraven scalding-commons scalding-parquet scalding-parquet-scrooge"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-core scalding-jdbc scalding-json scalding-db"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-core scalding-jdbc scalding-json scalding-db"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-hadoop-test"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-hadoop-test"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-serialization"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-serialization"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="base" TEST_TARGET="scalding-thrift-macros"
       script: "scripts/run_test.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="base" TEST_TARGET="scalding-thrift-macros"
       script: "scripts/run_test.sh"
 
-    - scala: 2.10.6
+    - scala: 2.11.8
       env: BUILD="test tutorials and matrix tutorials and repl" TEST_TARGET="scalding-repl"
       script:
       - "scripts/run_test.sh"
@@ -84,7 +84,7 @@ matrix:
       - "scripts/build_assembly_no_test.sh scalding-assembly"
       - "scripts/test_matrix_tutorials.sh"
 
-    - scala: 2.11.8
+    - scala: 2.12.1
       env: BUILD="test tutorials and matrix tutorials and repl" TEST_TARGET="scalding-repl"
       script:
       - "scripts/run_test.sh"
@@ -93,20 +93,20 @@ matrix:
       - "scripts/build_assembly_no_test.sh scalding-assembly"
       - "scripts/test_matrix_tutorials.sh"
 
-    - scala: 2.10.6
-      env: BUILD="test repl and typed tutorials"
+    - scala: 2.11.8
+      env: BUILD="test repl and typed tutorials and microsite"
       script:
+      - ./sbt ++$TRAVIS_SCALA_VERSION clean docs/makeMicrosite
       - "scripts/build_assembly_no_test.sh scalding-repl"
       - "scripts/test_repl_tutorial.sh"
       - "scripts/build_assembly_no_test.sh scalding-core"
       - "scripts/test_typed_tutorials.sh"
       - "scripts/build_assembly_no_test.sh execution-tutorial"
       - "scripts/test_execution_tutorial.sh"
 
-    - scala: 2.11.8
-      env: BUILD="test repl and typed tutorials and microsite"
+    - scala: 2.12.1
+      env: BUILD="test repl and typed tutorials"
       script:
-      - ./sbt ++$TRAVIS_SCALA_VERSION clean docs/makeMicrosite
       - "scripts/build_assembly_no_test.sh scalding-repl"
       - "scripts/test_repl_tutorial.sh"
       - "scripts/build_assembly_no_test.sh scalding-core"