use trusty distribution

.travis.yml

@@ -1,13 +1,13 @@
 language: java
-dist: precise
+dist: trusty
 jdk:
-  - openjdk7
-  - oraclejdk7
+  - openjdk8
   - oraclejdk8
+  - oraclejdk9
 install: true
 script:
-    - "./gradlew clean"
-    - "./gradlew exhaustiveTest"
+    - "gradle clean"
+    - "gradle exhaustiveTest"
     - "if [[ -n $TRAVIS_TAG ]]; then
           ./gradlew ship;
       else

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.optional-base' version '3.0.3'
+    id 'nebula.optional-base' version '3.2.0'
     id 'me.champeau.gradle.jmh' version '0.3.1'
 }
 
@@ -37,7 +37,6 @@ subprojects {
     apply plugin: 'jacoco'
     apply plugin: 'maven-publish'
     apply plugin: 'me.champeau.gradle.jmh'
-    apply plugin: 'nebula.provided-base'
     apply plugin: 'nebula.optional-base'
 
     sourceCompatibility = 1.6
@@ -108,6 +107,11 @@ subprojects {
         // logging dependencies (logback)
         testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
         testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
+
+        testCompile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+        testCompile group: 'org.json', name: 'json', version: jsonVersion
+        testCompile group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
+        testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
     }
 
     publishing {
@@ -172,7 +176,3 @@ task ship() {
     dependsOn(':core-api:ship', ':core-httpclient-impl:ship')
 }
 
-// todo: remove this wrapper version once we're publishing to jcenter/maven central
-task wrapper(type: Wrapper) {
-    distributionUrl = gradleWrapperUrl
-}

core-api/build.gradle

@@ -2,14 +2,14 @@ dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
 
-    provided group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
-    provided group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
+    compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
 
     // an assortment of json parsers
-    provided group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
-    provided group: 'org.json', name: 'json', version: jsonVersion, optional
-    provided group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion, optional
-    provided group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
+    compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
+    compileOnly group: 'org.json', name: 'json', version: jsonVersion, optional
+    compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion, optional
+    compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
 }
 
 task generateVersionFile {

core-httpclient-impl/build.gradle

@@ -1,9 +1,7 @@
 dependencies {
     compile project(':core-api')
 
-    provided group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
-    provided group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
-    provided group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+    compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
 
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
 }

gradle.properties

@@ -5,7 +5,6 @@ version = 2.0.0-SNAPSHOT
 mavenS3Bucket = optimizely-maven
 
 # Gradle Settings
-gradleWrapperUrl = https://github.com/optimizely/gradle/releases/download/REL_2.4-20150402032942%2B0000/gradle-2.4-20150402032942.0000-bin.zip
 org.gradle.configureondemand = true
 org.gradle.daemon = true
 org.gradle.parallel = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 23 16:11:46 PST 2016
+#Mon Sep 25 16:03:41 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+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
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,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 "$@")
+
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"