Skip to content

Commit 77ed839

Browse files
authored
use trusty distribution (#145)
Upgrade travis-ci travis.yml to use trusty distribution since that is their new standard. The gradle version of their linux distribution is gradle 4.0.1 so I upgraded our gradle wrapper to that. That required we upgrade our nebula dependency to 3.2.0. Drop support for JDK 7 until travis-ci can fix that.
1 parent 6baf16f commit 77ed839

File tree

9 files changed

+146
-143
lines changed

9 files changed

+146
-143
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: java
2-
dist: precise
2+
dist: trusty
33
jdk:
4-
- openjdk7
5-
- oraclejdk7
4+
- openjdk8
65
- oraclejdk8
6+
- oraclejdk9
77
install: true
88
script:
9-
- "./gradlew clean"
10-
- "./gradlew exhaustiveTest"
9+
- "gradle clean"
10+
- "gradle exhaustiveTest"
1111
- "if [[ -n $TRAVIS_TAG ]]; then
1212
./gradlew ship;
1313
else

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313

1414
plugins {
15-
id 'nebula.optional-base' version '3.0.3'
15+
id 'nebula.optional-base' version '3.2.0'
1616
id 'me.champeau.gradle.jmh' version '0.3.1'
1717
}
1818

@@ -37,7 +37,6 @@ subprojects {
3737
apply plugin: 'jacoco'
3838
apply plugin: 'maven-publish'
3939
apply plugin: 'me.champeau.gradle.jmh'
40-
apply plugin: 'nebula.provided-base'
4140
apply plugin: 'nebula.optional-base'
4241

4342
sourceCompatibility = 1.6
@@ -108,6 +107,11 @@ subprojects {
108107
// logging dependencies (logback)
109108
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
110109
testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
110+
111+
testCompile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
112+
testCompile group: 'org.json', name: 'json', version: jsonVersion
113+
testCompile group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
114+
testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
111115
}
112116

113117
publishing {
@@ -172,7 +176,3 @@ task ship() {
172176
dependsOn(':core-api:ship', ':core-httpclient-impl:ship')
173177
}
174178

175-
// todo: remove this wrapper version once we're publishing to jcenter/maven central
176-
task wrapper(type: Wrapper) {
177-
distributionUrl = gradleWrapperUrl
178-
}

core-api/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ dependencies {
22
compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
33
compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
44

5-
provided group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
6-
provided group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
5+
compile group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
6+
compile group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
77

88
// an assortment of json parsers
9-
provided group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
10-
provided group: 'org.json', name: 'json', version: jsonVersion, optional
11-
provided group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion, optional
12-
provided group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
9+
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion, optional
10+
compileOnly group: 'org.json', name: 'json', version: jsonVersion, optional
11+
compileOnly group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion, optional
12+
compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion, optional
1313
}
1414

1515
task generateVersionFile {

core-httpclient-impl/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
dependencies {
22
compile project(':core-api')
33

4-
provided group: 'com.google.code.findbugs', name: 'annotations', version: findbugsVersion
5-
provided group: 'com.google.code.findbugs', name: 'jsr305', version: findbugsVersion
6-
provided group: 'com.google.code.gson', name: 'gson', version: gsonVersion
4+
compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
75

86
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
97
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ version = 2.0.0-SNAPSHOT
55
mavenS3Bucket = optimizely-maven
66

77
# Gradle Settings
8-
gradleWrapperUrl = https://github.com/optimizely/gradle/releases/download/REL_2.4-20150402032942%2B0000/gradle-2.4-20150402032942.0000-bin.zip
98
org.gradle.configureondemand = true
109
org.gradle.daemon = true
1110
org.gradle.parallel = true

gradle/wrapper/gradle-wrapper.jar

1.04 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Feb 23 16:11:46 PST 2016
1+
#Mon Sep 25 16:03:41 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip

gradlew

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,43 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: $0 may be a link
11+
PRG="$0"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "$0"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

18-
warn ( ) {
36+
warn () {
1937
echo "$*"
2038
}
2139

22-
die ( ) {
40+
die () {
2341
echo
2442
echo "$*"
2543
echo
@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: $0 may be a link
47-
PRG="$0"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "$0")"
170+
fi
159171

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)