Update Scala to 2.11, fix travis build (#1316)

alyiwang · web-flow · commit 999ab051eea3 · 2018-08-13T09:45:52.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,15 @@ jdk:
   - oraclejdk8
 
 env:
-  - DOCKER_COMPOSE_VERSION=1.14.0
+  - DOCKER_COMPOSE_VERSION=1.22.0
 
 services:
   - docker
   - elasticsearch
 
 before_install:
   # elasticsearch
-  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.3/elasticsearch-2.3.3.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.3.deb && sudo service elasticsearch restart
+  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.5/elasticsearch-2.3.5.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.5.deb && sudo service elasticsearch restart
 
   # extralibs
   - wget https://github.com/ericsun2/sandbox/raw/master/extralibs/extralibs.zip
diff --git a/gradle/scripts/coverage.gradle b/gradle/scripts/coverage.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.palantir.jacoco-full-report'
 apply plugin: 'jacoco'
 
 // Must match the version used in jacoco4sbt plugin.
-ext.jacocoVersion = '0.7.1.201405082137'
+ext.jacocoVersion = '0.8.1'
 
 jacoco {
   toolVersion = jacocoVersion
diff --git a/gradle/scripts/dependency.gradle b/gradle/scripts/dependency.gradle
@@ -27,14 +27,16 @@ ext.externalDependency = [
     "logback"             : "ch.qos.logback:logback-classic:1.2.3",
     "jasypt"              : "org.jasypt:jasypt:1.9.2",
     "mockito"             : "org.mockito:mockito-core:2.13.0",
+    "festAssert"          : "org.easytesting:fest-assert-core:2.0M10",
+    "systemRules"         : "com.github.stefanbirkner:system-rules:1.16.0",
 
-    "play_java_jdbc"      : "com.typesafe.play:play-java-jdbc_2.10:2.4.11",
-    "play_java_ws"        : "com.typesafe.play:play-java-ws_2.10:2.4.11",
-    "play_cache"          : "com.typesafe.play:play-cache_2.10:2.4.11",
-    "play_filter"         : "com.typesafe.play:filters-helpers_2.10:2.4.11",
+    "play_java_jdbc"      : "com.typesafe.play:play-java-jdbc_2.11:2.4.11",
+    "play_java_ws"        : "com.typesafe.play:play-java-ws_2.11:2.4.11",
+    "play_cache"          : "com.typesafe.play:play-cache_2.11:2.4.11",
+    "play_filter"         : "com.typesafe.play:filters-helpers_2.11:2.4.11",
     "typesafe_config"     : "com.typesafe:config:1.3.1",
     "netty"               : "io.netty:netty:3.10.6.Final",
-    "akka"                : "com.typesafe.akka:akka-actor_2.10:2.3.16",
+    "akka"                : "com.typesafe.akka:akka-actor_2.11:2.3.16",
     "spring_jdbc"         : "org.springframework:spring-jdbc:4.1.9.RELEASE",
 
     "kafka_clients"       : "org.apache.kafka:kafka-clients:0.10.2.1",
diff --git a/wherehows-backend/build.gradle b/wherehows-backend/build.gradle
@@ -14,8 +14,8 @@ dependencies {
     play externalDependency.slf4j_api
     play externalDependency.jasypt
 
-    playTest 'com.github.stefanbirkner:system-rules:1.16.0'
-    playTest 'org.easytesting:fest-assert-core:2.0M10'
+    playTest externalDependency.systemRules
+    playTest externalDependency.festAssert
     playTest externalDependency.mockito
 }
 
diff --git a/wherehows-frontend/build.gradle b/wherehows-frontend/build.gradle
@@ -19,7 +19,7 @@ dependencies{
     play externalDependency.play_cache
     play externalDependency.mysql
 
-    playTest 'org.easytesting:fest-assert-core:2.0M10'
+    playTest externalDependency.festAssert
     playTest externalDependency.mockito
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ dependencies {`
`14`	`14`	`play externalDependency.slf4j_api`
`15`	`15`	`play externalDependency.jasypt`
`16`	`16`
`17`		`- playTest 'com.github.stefanbirkner:system-rules:1.16.0'`
`18`		`- playTest 'org.easytesting:fest-assert-core:2.0M10'`
	`17`	`+ playTest externalDependency.systemRules`
	`18`	`+ playTest externalDependency.festAssert`
`19`	`19`	`playTest externalDependency.mockito`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ dependencies{`
`19`	`19`	`play externalDependency.play_cache`
`20`	`20`	`play externalDependency.mysql`
`21`	`21`
`22`		`- playTest 'org.easytesting:fest-assert-core:2.0M10'`
	`22`	`+ playTest externalDependency.festAssert`
`23`	`23`	`playTest externalDependency.mockito`
`24`	`24`	`}`
`25`	`25`