Merge branch 'dev'

# Conflicts:
#	library/rx/build.gradle

.travis.yml

@@ -1,5 +1,5 @@
 language: java
-jdk: oraclejdk7
+jdk: oraclejdk8
 before_install:
  - chmod +x gradlew
 script:

README.md

@@ -29,7 +29,7 @@ It provides three approaches to work with API:
 - [Faye](#Faye)
 - [Samples](#Samples)
 
-###<a name="Setup">**Setup**
+### <a name="Setup">**Setup**
 Add gradle dependency:
 
 For RxJava:
@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.0'
+      compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.1'
 }
 ```
 
@@ -50,7 +50,7 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.0'
+      compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.1'
 }
 ```
 
@@ -61,11 +61,16 @@ repositories {
 }
 
 dependencies {
-      compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.0'
+      compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.1'
 }
 ```
 
-###<a name="ReleaseNotes">**Release notes**
+### <a name="ReleaseNotes">**Release notes**
+- **1.6.1** (04.01.2018)
+    - *Rx,Async,Sync:*
+        - Add `getRoomIdByUri` to room API
+	- Update dependencies used in the SDK
+
 - **1.6.0** (12.01.2017)
     - *RoomResponse:*
         - Remove `favouriteOrder`
@@ -117,7 +122,7 @@ dependencies {
 - **1.1.0**
     - Added room messages streaming API.
 
-###<a name="Features">**Features**
+### <a name="Features">**Features**
 
 - Authentication
 
@@ -153,7 +158,7 @@ dependencies {
 - Room user presence events
 - Room user managment events
 
-###<a name="Description">**Description**
+### <a name="Description">**Description**
 
 **Authentication**
 Please read [Authentication](https://developer.gitter.im/docs/authentication) article on **Gitter Developer**  before.
@@ -344,7 +349,7 @@ List<RoomResponse> rooms = client.getUserChannels("user_id");
 System.out.println("Received " + rooms.size() + " rooms");
 ```
 
-###<a name="Streaming">**How to get streaming data from Gitter Streaming API**
+### <a name="Streaming">**How to get streaming data from Gitter Streaming API**
 
 ### :heavy_exclamation_mark: Please don't set any log level for *RxGitterStreamingApiClient* as it blocks the stream.
 :heavy_exclamation_mark: If you get `java.net.SocketTimeoutException: Read timed out` try to encrease `ReadTimeout` in your `retrofit.client.Client` and spicify this client for `GutterApiClient` (`withClient()`).
@@ -382,7 +387,7 @@ client.getRoomEventsStream(roomId).subscribe(new Action1<RoomEvent>() {
 });
 ```
 
-###<a name="Faye">**How to work with Gitter Faye API**
+### <a name="Faye">**How to work with Gitter Faye API**
 
 1 Setup ```AsyncGitterFayeClient```:
 
@@ -494,7 +499,7 @@ client.disconnect();
 
 Thats all =).
 
-###<a name="Samples">**Samples**
+### <a name="Samples">**Samples**
 
 You can see some code samples [here](https://github.com/Gitteroid/GitterJavaSDK/tree/master/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples)
 

build.gradle

@@ -12,7 +12,7 @@ buildscript {
 }
 
 allprojects {
-    version '1.6.0'
+    version '1.6.1'
 
     repositories {
         jcenter()

library/async/build.gradle

@@ -20,7 +20,7 @@ artifacts {
 publish {
     groupId = 'com.github.amatkivskiy'
     artifactId = 'gitter.sdk.async'
-    publishVersion = '1.6.0'
+    publishVersion = '1.6.1'
     desc = 'Gitter.im Java SDK that facilitates communication with Gitter API and Gitter Faye API'
     licences = ['MIT']
     website = 'https://github.com/Gitteroid/GitterJavaSDK'
@@ -32,6 +32,6 @@ dependencies {
     compile project(':library:core')
 //    compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
 
-    compile 'com.squareup.okio:okio:1.6.0'
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    compile 'com.squareup.okio:okio:1.13.0'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
 }

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/api/AsyncGitterApi.java

@@ -57,6 +57,10 @@ void searchUsers(
   void searchUsers(@Query("q") String searchTerm, Callback<SearchUsersResponse> callback);
 
   // Rooms Api
+  @POST("/rooms")
+  @FormUrlEncoded
+  void getRoomIdByUri(@Field("uri") String uri, Callback<RoomResponse> callback);
+
   @GET("/rooms/{roomId}")
   void getRoomById(@Path("roomId") String roomId, Callback<RoomResponse> callback);
 

library/async/src/main/java/com/amatkivskiy/gitter/sdk/async/client/AsyncGitterApiClient.java

@@ -87,6 +87,10 @@ public void failure(RetrofitError error) {
   }
 
   // Rooms API
+  public void getRoomIdByUri(String uri, Callback<RoomResponse> callback) {
+    api.getRoomIdByUri(uri, callback);
+  }
+
   public void getRoomUsers(String roomId, Callback<List<UserResponse>> callback) {
     api.getRoomUsers(roomId, callback);
   }

library/rx/build.gradle

@@ -29,7 +29,7 @@ artifacts {
 publish {
     groupId = 'com.github.amatkivskiy'
     artifactId = 'gitter.sdk.rx'
-    publishVersion = '1.6.0'
+    publishVersion = '1.6.1'
     desc = 'Gitter.im RxJava SDK that facilitates communication with Gitter API'
     licences = ['MIT']
     website = 'https://github.com/Gitteroid/GitterJavaSDK'
@@ -38,9 +38,9 @@ publish {
 }
 
 dependencies {
-//    compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
-    compile project(':library:core')
-    compile 'io.reactivex:rxjava:1.1.0'
+    compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
+//    compile project(':library:core')
+    compile 'io.reactivex:rxjava:1.3.4'
 
     testCompile 'org.mockito:mockito-core:2.1.0-RC.1'
     testCompile 'junit:junit:4.12'

library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/api/RxGitterApi.java

@@ -50,6 +50,10 @@ public interface RxGitterApi {
   Observable<SearchUsersResponse> searchUsers(@Query("q") String searchTerm);
 
   // Rooms API
+  @POST("/rooms")
+  @FormUrlEncoded
+  Observable<RoomResponse> getRoomIdByUri(@Field("uri") String uri);
+
   @GET("/rooms/{roomId}")
   Observable<RoomResponse> getRoomById(@Path("roomId") String roomId);
 

library/rx/src/main/java/com/amatkivskiy/gitter/sdk/rx/client/RxGitterApiClient.java

@@ -72,6 +72,10 @@ public List<UserResponse> call(SearchUsersResponse searchUsersResponse) {
   }
 
   // Rooms API
+  public Observable<RoomResponse> getRoomIdByUri(String uri) {
+    return api.getRoomIdByUri(uri);
+  }
+
   public Observable<RoomResponse> getRoomById(String roomId) {
     return api.getRoomById(roomId);
   }

library/sync/build.gradle

@@ -20,7 +20,7 @@ artifacts {
 publish {
     groupId = 'com.github.amatkivskiy'
     artifactId = 'gitter.sdk.sync'
-    publishVersion = '1.6.0'
+    publishVersion = '1.6.1'
     desc = 'Gitter.im Java SDK that facilitates communication with Gitter API'
     licences = ['MIT']
     website = 'https://github.com/Gitteroid/GitterJavaSDK'

library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/api/SyncGitterApi.java

@@ -52,6 +52,10 @@ public interface SyncGitterApi {
   SearchUsersResponse searchUsers(@Query("q") String searchTerm);
 
   // Rooms API
+  @POST("/rooms")
+  @FormUrlEncoded
+  RoomResponse getRoomIdByUri(@Field("uri") String uri);
+
   @GET("/rooms/{roomId}")
   RoomResponse getRoomById(@Path("roomId") String roomId);
 

library/sync/src/main/java/com/amatkivskiy/gitter/sdk/sync/client/SyncGitterApiClient.java

@@ -66,6 +66,10 @@ public List<RoomResponse> getCurrentUserRooms() {
   }
 
   // Rooms API
+  public RoomResponse getRoomIdByUri(String uri) {
+    return api.getRoomIdByUri(uri);
+  }
+
   public RoomResponse getUserRooms(String userId) {
     return api.getUserRooms(userId);
   }

samples/build.gradle

@@ -9,8 +9,5 @@ dependencies {
     compile project(':library:async')
     compile project(':library:sync')
 
-    compile 'com.squareup.okio:okio:1.6.0'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
-    compile 'com.squareup.okhttp:okhttp-ws:2.5.0'
-    compile 'com.appunite:websockets-rxjava:3.0.0'
 }