Skip to content

Commit

Permalink
Merge pull request #474 from csmith/master
Browse files Browse the repository at this point in the history
Update dependencies.
  • Loading branch information
greboid committed May 5, 2016
2 parents 6615715 + 0e6e1e8 commit 660b332
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 26 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ subprojects {
dependencies {
compile group: 'com.dmdirc', name: 'client', version: '+', changing: true

compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.1'
compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
compile group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.4'

testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.17'
testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'

pmd group: 'net.sourceforge.pmd', name: 'pmd-core', version: '5.2.3'
pmd group: 'net.sourceforge.pmd', name: 'pmd-java', version: '5.2.3'
pmd group: 'net.sourceforge.pmd', name: 'pmd-core', version: '5.4.1'
pmd group: 'net.sourceforge.pmd', name: 'pmd-java', version: '5.4.1'
}

task copyPluginConfig(type: Copy) {
Expand Down Expand Up @@ -141,12 +141,12 @@ buildscript {

dependencies {
classpath group: 'com.dmdirc', name: 'git-version', version: '1.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.1.0'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
}
}

task wrapper(type: Wrapper) {
gradleVersion = '2.11'
gradleVersion = '2.13'
}

subprojects.each { evaluationDependsOn it.path }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Feb 21 16:59:09 GMT 2016
#Thu May 05 16:39:13 BST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
10 changes: 3 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ case "`uname`" in
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
Expand All @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

Expand Down Expand Up @@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail

: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 "%@eval[2+2]" == "4" goto 4NT_args
Expand Down
4 changes: 2 additions & 2 deletions logging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
*/

dependencies {
testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
}
testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
}
2 changes: 1 addition & 1 deletion nickcolours/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
compile plugin('ui_swing')
compile group: 'com.google.auto.value', name: 'auto-value', version: '1.0'
compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
}
4 changes: 2 additions & 2 deletions sessionlock/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
bundle group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
bundle group: 'net.java.dev.jna', name: 'jna-platform', version: '4.1.0'
bundle group: 'net.java.dev.jna', name: 'jna', version: '4.2.2'
bundle group: 'net.java.dev.jna', name: 'jna-platform', version: '4.2.2'
bundle group: 'com.greboid.libraries', name: 'locksupport', version: 'latest.release'
}
2 changes: 1 addition & 1 deletion ui_swing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
bundle group: 'com.miglayout', name: 'miglayout-swing', version: '4.2'
bundle group: 'com.miglayout', name: 'miglayout-swing', version: '5.0'
bundle group: 'com.greboid.libraries', name: 'menuscroller', version: 'latest.release'
}
2 changes: 1 addition & 1 deletion ui_web2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
bundle group: 'com.sparkjava', name: 'spark-core', version: '2.3'
bundle group: 'com.sparkjava', name: 'spark-core', version: '2.5'
bundle group: 'com.google.code.gson', name: 'gson', 'version': '2.5'
}
4 changes: 2 additions & 2 deletions windowflashing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
compile plugin('ui_swing')
bundle group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
bundle group: 'net.java.dev.jna', name: 'jna-platform', version: '4.1.0'
bundle group: 'net.java.dev.jna', name: 'jna', version: '4.2.2'
bundle group: 'net.java.dev.jna', name: 'jna-platform', version: '4.2.2'
}

0 comments on commit 660b332

Please sign in to comment.