Merge branch 'master' of https://github.com/DMDirc/Meta

build.gradle

@@ -12,6 +12,6 @@ tasks.dependencies.dependsOn subprojects*.tasks.dependencies
 
 task wrapper(type: Wrapper) {
     description 'Downloads and installs an up-to-date wrapper for gradle.'
-    gradleVersion = '2.14'
+    gradleVersion = '3.1'
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jul 04 18:46:31 BST 2016
+#Thu Oct 27 18:01:10 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

gradlew

@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

settings.gradle

@@ -1,6 +1,7 @@
 rootProject.name = 'dmdirc'
 
 include 'client'
+include 'client:api'
 include 'util'
 include 'parser'
 include 'plugins'
@@ -8,6 +9,7 @@ include 'parser:common'
 include 'parser:irc'
 include 'parser:xmpp'
 
+project(':client:api').name = 'api'
 project(':parser:common').name = 'parser-common'
 project(':parser:irc').name = 'parser-irc'
 project(':parser:xmpp').name = 'parser-xmpp'