Skip to content

Commit

Permalink
Update Gralde to 4.9 & Scala to 2.11 (#1315)
Browse files Browse the repository at this point in the history
* Update Gralde to 4.9 & Scala to 2.11

* Update play.gradle

* Update repositories.gradle
  • Loading branch information
mars-lan authored Aug 11, 2018
1 parent 08ddda0 commit d18595f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ apply from: 'gradle/scripts/ide.gradle'
apply from: 'gradle/scripts/license.gradle'

task wrapper(type: Wrapper) {
gradleVersion = '4.8'
gradleVersion = '4.9'
}

if (project.hasProperty('overrideBuildEnvironment')) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/scripts/play.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tasks.withType(PlayRun) {
model {
components {
play {
platform play: '2.4.11', scala: '2.10'
platform play: '2.4.11', scala: '2.11', java: '1.8'

binaries.all {
tasks.withType(PlatformScalaCompile) {
Expand Down
11 changes: 5 additions & 6 deletions gradle/scripts/repositories.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ repositories {
dirs 'extralibs'
}
mavenCentral()
jcenter()
maven {
name "typesafe-maven-release"
url "https://repo.typesafe.com/typesafe/maven-releases"
name "lightbend-maven-release"
url "https://repo.lightbend.com/lightbend/maven-releases"
}
ivy {
name "typesafe-ivy-release"
url "https://repo.typesafe.com/typesafe/ivy-releases"
layout "ivy"
name "lightbend-ivy-release"
url "https://repo.lightbend.com/lightbend/ivy-releases"
layout "ivy"
}
maven { // this is required for hive
name "conjars-maven-release"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Thu Jun 07 22:25:40 EDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip

0 comments on commit d18595f

Please sign in to comment.