Browse Source

Merge pull request #172 from jochenberger/update-dependencies

Update dependencies and Gradle wrapper
pull/169/merge
kallestenflo 9 years ago
parent
commit
bcbd9966ef
  1. 6
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 4
      gradle/wrapper/gradle-wrapper.properties

6
build.gradle

@ -12,7 +12,7 @@ buildscript {
ext { ext {
libs = [ libs = [
slf4jApi: 'org.slf4j:slf4j-api:1.7.13', slf4jApi: 'org.slf4j:slf4j-api:1.7.13',
jsonSmart: 'net.minidev:json-smart:2.2', jsonSmart: 'net.minidev:json-smart:2.2.1',
jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.6.3', jacksonDatabind: 'com.fasterxml.jackson.core:jackson-databind:2.6.3',
gson: 'com.google.code.gson:gson:2.3.1', gson: 'com.google.code.gson:gson:2.3.1',
jsonOrg: 'org.json:json:20140107', jsonOrg: 'org.json:json:20140107',
@ -20,7 +20,7 @@ ext {
hamcrestCore: 'org.hamcrest:hamcrest-core:1.3', hamcrestCore: 'org.hamcrest:hamcrest-core:1.3',
hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3', hamcrestLibrary: 'org.hamcrest:hamcrest-library:1.3',
test: ['org.slf4j:slf4j-simple:1.7.12', 'org.assertj:assertj-core:2.1.0', 'commons-io:commons-io:2.4','org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.12'] test: ['org.slf4j:slf4j-simple:1.7.13', 'org.assertj:assertj-core:2.1.0', 'commons-io:commons-io:2.4','org.hamcrest:hamcrest-core:1.3', 'org.hamcrest:hamcrest-library:1.3', 'junit:junit:4.12']
] ]
snapshotVersion = true snapshotVersion = true
} }
@ -72,7 +72,7 @@ subprojects {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.8' gradleVersion = '2.9'
} }
//Task used by Heroku for staging //Task used by Heroku for staging

BIN
gradle/wrapper/gradle-wrapper.jar vendored

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored

@ -1,6 +1,6 @@
#Thu Nov 05 08:42:18 CET 2015 #Mon Dec 14 13:19:40 CET 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

Loading…
Cancel
Save