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

9 files changed

Lines changed: 146 additions & 143 deletions

File tree

.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
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)