Skip to content

Update Scala version to 2.10.6 #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnynek merged 1 commit into from
Dec 28, 2015
Merged

Update Scala version to 2.10.6 #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,55 +14,55 @@ 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"

- scala: 2.11.7
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"

- scala: 2.11.7
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"

- scala: 2.11.7
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"

- scala: 2.11.7
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"

- scala: 2.11.7
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"

- scala: 2.11.7
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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
2 changes: 1 addition & 1 deletion sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")"
Expand Down