Browse Source

Merge pull request #189 from jochenberger/update-dependencies

Update dependencies
pull/193/head
kallestenflo 9 years ago
parent
commit
82723a9101
  1. 10
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 4
      gradle/wrapper/gradle-wrapper.properties
  4. 2
      gradlew.bat

10
build.gradle

@ -4,23 +4,23 @@ buildscript {
} }
dependencies { dependencies {
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1' classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2' classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0' classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.0'
} }
} }
ext { ext {
libs = [ libs = [
slf4jApi: 'org.slf4j:slf4j-api:1.7.13', slf4jApi: 'org.slf4j:slf4j-api:1.7.16',
jsonSmart: 'net.minidev:json-smart:2.2.1', 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',
tapestryJson: 'org.apache.tapestry:tapestry-json:5.4-rc-1', tapestryJson: 'org.apache.tapestry:tapestry-json:5.4.0',
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.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'] test: ['org.slf4j:slf4j-simple:1.7.16', '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.9' gradleVersion = '2.11'
} }
//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 @@
#Mon Dec 14 13:19:40 CET 2015 #Fri Feb 12 10:36:51 CET 2016
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.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip

2
gradlew.bat vendored

@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail goto fail
:init :init
@rem Get command-line arguments, handling Windowz variants @rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args if "%@eval[2+2]" == "4" goto 4NT_args

Loading…
Cancel
Save