bumped gradle version, exclude gson from shading

Author: pkaeding

build.gradle

@@ -25,17 +25,35 @@ allprojects {
     targetCompatibility = 1.7
 }
 
+ext.libraries = [:]
+
+libraries.shaded = [
+    "commons-codec:commons-codec:1.10",
+    "com.google.guava:guava:19.0",
+    "joda-time:joda-time:2.9.3",
+    "com.launchdarkly:okhttp-eventsource:1.5.0",
+    "redis.clients:jedis:2.9.0"
+]
+
+libraries.unshaded = [
+    "com.google.code.gson:gson:2.7",
+    "org.slf4j:slf4j-api:1.7.21"
+]
+
+libraries.testCompile = [
+    "org.easymock:easymock:3.4",
+    "junit:junit:4.12"
+]
+
+libraries.testRuntime = [
+    "ch.qos.logback:logback-classic:1.1.7"
+]
+
 dependencies {
-    compile "commons-codec:commons-codec:1.10"
-    compile "com.google.code.gson:gson:2.7"
-    compile "com.google.guava:guava:19.0"
-    compile "joda-time:joda-time:2.9.3"
-    compile "org.slf4j:slf4j-api:1.7.21"
-    compile group: "com.launchdarkly", name: "okhttp-eventsource", version: "1.5.0", changing: true
-    compile "redis.clients:jedis:2.9.0"
-    testCompile "org.easymock:easymock:3.4"
-    testCompile 'junit:junit:4.12'
-    testRuntime "ch.qos.logback:logback-classic:1.1.7"
+    compile libraries.shaded, libraries.unshaded
+    testCompile libraries.testCompile
+    testRuntime libraries.testRuntime
+    shadow libraries.unshaded
 }
 
 jar {
@@ -49,7 +67,7 @@ jar {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14-rc-3'
+    gradleVersion = '4.2.1'
 }
 
 buildscript {
@@ -60,7 +78,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.ajoberstar:gradle-git:1.5.0-rc.1'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.8.0"
     }
 }
@@ -100,6 +118,7 @@ shadowJar {
     // Don't shade or include slf4j
     dependencies{
         exclude(dependency('org.slf4j:.*:.*'))
+        exclude(dependency('com.google.code.gson:.*:.*'))
     }
 
     // Shade all jars except for launchdarkly

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Tue Jun 07 10:02:02 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-rc-3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# 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" "$@"

gradlew

@@ -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