Merge pull request #212 from intercom/timlim/release-2.5.0

Release 2.5.0

Author: thewheat

CHANGES.md

@@ -1,5 +1,15 @@
 ### Changes
 
+#### 2.5.0
+- Fix for #207 to remove a non-existent API call (PR #211)
+- Fix for #197 to prioritise user_id when tagging users (PR #199)
+- Update of Jackson dependencies (PR #203)
+- Fix for #197 to prioritise user_id when tagging users (PR #199)
+- Fix for #202 to enable retrieving company session count (PR #213)
+- Update Gradle (PR #216)
+- Add template for Pull Requests (PR #217)
+- Removal of Travis (PR #219)
+
 #### 2.4.0
 - Fix for gradle release issue #192
 - Update related to API user archive and permanent delete option #195

README.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.4.0</version>
+  <version>2.5.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.4.0'
+  compile 'io.intercom:intercom-java:2.5.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.4.0"
+libraryDependencies += "io.intercom" % "intercom-java" % "2.5.0"
 ```
 
 ## Resources

gradle.properties

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

intercom-java/src/main/java/io/intercom/api/Intercom.java

@@ -15,7 +15,7 @@ enum AuthKeyType {
         TOKEN
     }
 
-    private static final String VERSION = "2.4.0";
+    private static final String VERSION = "2.5.0";
 
     public static final String USER_AGENT = "intercom-java/" + Intercom.VERSION;