Merge branch 'master' into timlim/fix-company-session-count

Author: thewheat

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/openjdk
+      - image: circleci/openjdk:8-jdk-stretch-node-browsers
 
     working_directory: ~/intercom-java
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+#### Why?
+Why are you making this change?
+
+#### How?
+Technical details on your change

build.gradle

@@ -61,5 +61,5 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.0'
+  gradleVersion = '4.9'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Wed Sep 24 10:57:43 IST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -76,7 +76,7 @@ public void testAdminReply() {
         } catch (InvalidException e) {
             fail();
         }
-        
+
         adminReply.setAttachmentUrls(new String[]{"http://www.example.com/attachment.jpg"});
         try {
             Conversation.validateAdminReplyRequest(adminReply);