Skip to content

Commit 7090a8a

Browse files
authored
Merge pull request #216 from intercom/seanhealy/fixCIBuild
Update Gradle from 2.0 -> 4.9
2 parents 6288400 + 7131bea commit 7090a8a

File tree

7 files changed

+51
-50
lines changed

7 files changed

+51
-50
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: circleci/openjdk
5+
- image: circleci/openjdk:8-jdk-stretch-node-browsers
66

77
working_directory: ~/intercom-java
88

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ subprojects {
6161
}
6262

6363
task wrapper(type: Wrapper) {
64-
gradleVersion = '2.0'
64+
gradleVersion = '4.9'
6565
}

gradle/wrapper/gradle-wrapper.jar

3.32 KB
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Sep 24 10:57:43 IST 2014
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradlew

Lines changed: 43 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

intercom-java/src/test/java/io/intercom/api/ConversationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testAdminReply() {
7676
} catch (InvalidException e) {
7777
fail();
7878
}
79-
79+
8080
adminReply.setAttachmentUrls(new String[]{"http://www.example.com/attachment.jpg"});
8181
try {
8282
Conversation.validateAdminReplyRequest(adminReply);

0 commit comments

Comments
 (0)