Browse Source

Update dependencies

pull/690/head
Chris Smith 8 years ago
parent
commit
272493d175
5 changed files with 19 additions and 23 deletions
  1. 13
    13
      build.gradle
  2. BIN
      gradle/wrapper/gradle-wrapper.jar
  3. 2
    2
      gradle/wrapper/gradle-wrapper.properties
  4. 3
    7
      gradlew
  5. 1
    1
      gradlew.bat

+ 13
- 13
build.gradle View File

@@ -1,6 +1,6 @@
1 1
 plugins {
2 2
   id 'com.dmdirc.git-version' version '1.0'
3
-  id 'com.github.kt3k.coveralls' version '2.1.0'
3
+  id 'com.github.kt3k.coveralls' version '2.6.3'
4 4
   id 'maven-publish'
5 5
   id 'java'
6 6
   id 'findbugs'
@@ -32,24 +32,24 @@ configurations.all {
32 32
 }
33 33
 
34 34
 dependencies {
35
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
36
-    compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
37
-    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.0'
35
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
36
+    compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.4'
37
+    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
38 38
 
39
-    bundle group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.2'
40
-    bundle group: 'org.slf4j', name: 'slf4j-api', version:'1.7.10'
41
-    bundle group: 'com.squareup.dagger', name: 'dagger', version: '1.2.1'
42
-    bundle group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version: '1.08'
39
+    bundle group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.7'
40
+    bundle group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
41
+    bundle group: 'com.squareup.dagger', name: 'dagger', version: '1.2.4'
42
+    bundle group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version: '1.09'
43 43
     bundle group: 'net.kencochrane.raven', name: 'raven', version: '6.0.1-SNAPSHOT'
44
-    bundle group: 'com.google.guava', name:'guava', version: '18.0'
45
-    bundle group: 'net.engio', name: 'mbassador', version: '1.2.4'
44
+    bundle group: 'com.google.guava', name:'guava', version: '19.0'
45
+    bundle group: 'net.engio', name: 'mbassador', version: '1.2.4.2'
46 46
     bundle group: 'com.google.code.gson', name: 'gson', 'version': '2.5'
47 47
     bundle group: 'com.dmdirc', name: 'util', version: '+', changing: true
48 48
     bundle group: 'com.dmdirc.parser', name: 'common', version: '+', changing: true
49 49
 
50 50
     testCompile group: 'junit', name: 'junit', version: '4.12'
51
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.17'
52
-    testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
51
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
52
+    testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
53 53
 }
54 54
 
55 55
 sourceSets {
@@ -78,5 +78,5 @@ apply from: 'gradle/jar.gradle'
78 78
 apply from: 'gradle/fatjar.gradle'
79 79
 
80 80
 task wrapper(type: Wrapper) {
81
-    gradleVersion = '2.11'
81
+    gradleVersion = '2.13'
82 82
 }

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 2
- 2
gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +1,6 @@
1
-#Sun Feb 21 16:57:58 GMT 2016
1
+#Thu May 05 16:29:58 BST 2016
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip

+ 3
- 7
gradlew View File

@@ -42,11 +42,6 @@ case "`uname`" in
42 42
     ;;
43 43
 esac
44 44
 
45
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
46
-if $cygwin ; then
47
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48
-fi
49
-
50 45
 # Attempt to set APP_HOME
51 46
 # Resolve links: $0 may be a link
52 47
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
61 56
     fi
62 57
 done
63 58
 SAVED="`pwd`"
64
-cd "`dirname \"$PRG\"`/" >&-
59
+cd "`dirname \"$PRG\"`/" >/dev/null
65 60
 APP_HOME="`pwd -P`"
66
-cd "$SAVED" >&-
61
+cd "$SAVED" >/dev/null
67 62
 
68 63
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69 64
 
@@ -114,6 +109,7 @@ fi
114 109
 if $cygwin ; then
115 110
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116 111
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112
+    JAVACMD=`cygpath --unix "$JAVACMD"`
117 113
 
118 114
     # We build the pattern for arguments to be converted via cygpath
119 115
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

+ 1
- 1
gradlew.bat View File

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

Loading…
Cancel
Save