Merge branch 'master' into timlim/tag-contacts

Author: thewheat

.circleci/config.yml

@@ -0,0 +1,12 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/openjdk:8-jdk-stretch-node-browsers
+
+    working_directory: ~/intercom-java
+
+    steps:
+      - checkout
+      - run: TERM="dumb" ./gradlew dependencies
+      - run: TERM="dumb" ./gradlew test

.github/PULL_REQUEST_TEMPLATE.md

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

.travis.yml

@@ -1,5 +1,12 @@
 ### Changes
 
+#### 2.4.0
+- Fix for gradle release issue #192
+- Update related to API user archive and permanent delete option #195
+
+#### 2.3.3
+- Fix for #185: scroll issue where requests not reaching endpoint (PR #186)
+
 #### 2.3.2
 - fix for #(174) to Handle records with no avatars (#181)
 

CHANGES.md

@@ -38,7 +38,7 @@ and add the project declaration to your `pom.xml`:
 <dependency>
   <groupId>io.intercom</groupId>
   <artifactId>intercom-java</artifactId>
-  <version>2.3.2</version>
+  <version>2.4.0</version>
 </dependency>
 ```
 
@@ -56,7 +56,7 @@ and add the project to the `dependencies` block in your `build.gradle`:
 
 ```groovy
 dependencies {
-  compile 'io.intercom:intercom-java:2.3.2'
+  compile 'io.intercom:intercom-java:2.4.0'
 }  
 ```
 
@@ -71,7 +71,7 @@ resolvers += "jcenter" at "http://jcenter.bintray.com"
 and add the project to your `libraryDependencies` in your `build.sbt`:
 
 ```scala
-libraryDependencies += "io.intercom" % "intercom-java" % "2.3.2"
+libraryDependencies += "io.intercom" % "intercom-java" % "2.4.0"
 ```
 
 ## Resources
@@ -436,13 +436,13 @@ Conversation.create(adminMessage);
 // send a message from a user
 UserMessage userMessage = new UserMessage()
     .setBody("Hey! Is there, is there a reward?")
-    .setUser(user);
+    .setFrom(user);
 Conversation.create(userMessage);
 
 // send a message from a contact
 ContactMessage contactMessage = new ContactMessage()
     .setBody("Hey! Is there, is there a reward?")
-    .setUser(contact);
+    .setFrom(contact);
 Conversation.create(contactMessage);
 
 //list all conversations

README.md

@@ -6,7 +6,7 @@ buildscript {
   //noinspection GroovyAssignabilityCheck
   dependencies {
     classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.6'
-    classpath 'org.ajoberstar:gradle-git:0.10.0'
+    classpath 'org.ajoberstar:grgit:1.9.3'
   }
 }
 
@@ -24,7 +24,7 @@ subprojects {
     //noinspection GroovyAssignabilityCheck
     dependencies {
       classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.6'
-      classpath 'org.ajoberstar:gradle-git:0.10.0'
+      classpath 'org.ajoberstar:grgit:1.9.3'
     }
   }
 
@@ -33,6 +33,11 @@ subprojects {
     mavenCentral()
   }
 
+  ext {
+    jacksonVersion = '2.9.6'
+    powermockVersion = '1.6.6'
+  }
+
   apply plugin: 'maven'
   apply plugin: 'maven-publish'
   apply plugin: 'java'
@@ -43,19 +48,18 @@ subprojects {
 
   //noinspection GroovyAssignabilityCheck
   dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-core:2.4.2'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.2'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
-    compile 'com.google.guava:guava:17.0'
-    compile 'org.slf4j:slf4j-api:1.7.7'
-    compile 'commons-codec:commons-codec:1.9'
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.powermock:powermock-module-junit4:1.6.6'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.6'
+    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    compile "com.google.guava:guava:17.0"
+    compile "org.slf4j:slf4j-api:1.7.25"
+    compile "commons-codec:commons-codec:1.9"
+    testCompile "junit:junit:4.12"
+    testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
+    testCompile "org.powermock:powermock-api-mockito:$powermockVersion"
   }
 }
 
-
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.0'
+  gradleVersion = '4.9'
 }

build.gradle

@@ -1,4 +1,4 @@
-version: 2.3.2
+version: 2.4.0
 
 groupId: io.intercom
 

gradle.properties

@@ -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