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

Update Scala to 2.11 #1316

Merged
merged 1 commit into from
Aug 13, 2018
Merged

Update Scala to 2.11 #1316

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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/scripts/coverage.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions gradle/scripts/dependency.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's order the list alphabetically in the next PR.

"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",
Expand Down
4 changes: 2 additions & 2 deletions wherehows-backend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion wherehows-frontend/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down