Skip to content
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

Scalding updates for Scala 2.12 #1646

Merged
merged 28 commits into from
Mar 23, 2017
Merged

Scalding updates for Scala 2.12 #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
1c85a3a
start upgrade to 2.12
sritchie-stripe Dec 11, 2016
aff0070
Bump bijection, chill
Feb 24, 2017
b37fbd3
Add Scala 2.12 related repl code
Feb 24, 2017
1a80f47
Scala 2.12 version bumps + _equals fix
Feb 24, 2017
fc5144e
Suppress Option[Partial] warnings
Feb 24, 2017
0551acd
Add fallback for scrooge-serializer on Scala 2.10
Feb 24, 2017
40ab7d0
Add scala 2.12 build targets
Feb 24, 2017
e6f09be
Fix parquet-scrooge and parquet tests on 2.12
Feb 28, 2017
51c1ec5
Drop support for 2.10
Mar 1, 2017
23d739e
Fix scalding-serialization tests
Mar 1, 2017
bb188b0
Get thrift macros to compile with latest Scalacheck
Mar 1, 2017
97e8df0
Fix scalding-db tests
Mar 1, 2017
feb5545
Exclude guava from scrooge imports
Mar 1, 2017
12280e0
Use mima 0.1.14
Mar 1, 2017
8cfe4db
Update scalding-thrift-macros jdk version to java8
Mar 2, 2017
6db5cf2
Fix OrderedSerialization test failures
Mar 9, 2017
3b2bef7
Break boxed lambdas into 2 lists to get around Scala 2.12 bug
Mar 17, 2017
0c4033b
Try catching CNF in LineNumber
Mar 20, 2017
4459b80
Drop line numbers from hashJoin scalding hadoop test
Mar 20, 2017
60ef980
Switch default to jdk8 as scrooge deps have been built with that
Mar 20, 2017
470d85f
Update scald.rb to pick up 2.12
Mar 20, 2017
b3a40e6
Try latest jline version
Mar 21, 2017
ed55f8a
Try and fix merge issues
Mar 21, 2017
643220f
Wrap Execution line better
Mar 21, 2017
36ca140
Remove scrooge method
Mar 22, 2017
5201750
Drop _equals method
Mar 22, 2017
26237d6
Try private[ser] for Boxed issues
Mar 22, 2017
f2fd0f2
Reorder hashCode and equals
Mar 23, 2017
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
40 changes: 20 additions & 20 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: scala
jdk: oraclejdk7
jdk: oraclejdk8
sudo: false

before_install:
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading