Skip to content

Commit 9cc308b

Browse files
committed
Merge branch 'dev'
# Conflicts: # library/rx/build.gradle
2 parents 755886e + 1e32091 commit 9cc308b

File tree

13 files changed

+49
-23
lines changed

13 files changed

+49
-23
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: java
2-
jdk: oraclejdk7
2+
jdk: oraclejdk8
33
before_install:
44
- chmod +x gradlew
55
script:

README.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ It provides three approaches to work with API:
2929
- [Faye](#Faye)
3030
- [Samples](#Samples)
3131

32-
###<a name="Setup">**Setup**
32+
### <a name="Setup">**Setup**
3333
Add gradle dependency:
3434

3535
For RxJava:
@@ -39,7 +39,7 @@ repositories {
3939
}
4040
4141
dependencies {
42-
compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.0'
42+
compile 'com.github.amatkivskiy:gitter.sdk.rx:1.6.1'
4343
}
4444
```
4545

@@ -50,7 +50,7 @@ repositories {
5050
}
5151
5252
dependencies {
53-
compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.0'
53+
compile 'com.github.amatkivskiy:gitter.sdk.async:1.6.1'
5454
}
5555
```
5656

@@ -61,11 +61,16 @@ repositories {
6161
}
6262
6363
dependencies {
64-
compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.0'
64+
compile 'com.github.amatkivskiy:gitter.sdk.sync:1.6.1'
6565
}
6666
```
6767

68-
###<a name="ReleaseNotes">**Release notes**
68+
### <a name="ReleaseNotes">**Release notes**
69+
- **1.6.1** (04.01.2018)
70+
- *Rx,Async,Sync:*
71+
- Add `getRoomIdByUri` to room API
72+
- Update dependencies used in the SDK
73+
6974
- **1.6.0** (12.01.2017)
7075
- *RoomResponse:*
7176
- Remove `favouriteOrder`
@@ -117,7 +122,7 @@ dependencies {
117122
- **1.1.0**
118123
- Added room messages streaming API.
119124

120-
###<a name="Features">**Features**
125+
### <a name="Features">**Features**
121126

122127
- Authentication
123128

@@ -153,7 +158,7 @@ dependencies {
153158
- Room user presence events
154159
- Room user managment events
155160

156-
###<a name="Description">**Description**
161+
### <a name="Description">**Description**
157162

158163
**Authentication**
159164
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");
344349
System.out.println("Received " + rooms.size() + " rooms");
345350
```
346351

347-
###<a name="Streaming">**How to get streaming data from Gitter Streaming API**
352+
### <a name="Streaming">**How to get streaming data from Gitter Streaming API**
348353

349354
### :heavy_exclamation_mark: Please don't set any log level for *RxGitterStreamingApiClient* as it blocks the stream.
350355
: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>() {
382387
});
383388
```
384389

385-
###<a name="Faye">**How to work with Gitter Faye API**
390+
### <a name="Faye">**How to work with Gitter Faye API**
386391

387392
1 Setup ```AsyncGitterFayeClient```:
388393

@@ -494,7 +499,7 @@ client.disconnect();
494499

495500
Thats all =).
496501

497-
###<a name="Samples">**Samples**
502+
### <a name="Samples">**Samples**
498503

499504
You can see some code samples [here](https://github.com/Gitteroid/GitterJavaSDK/tree/master/samples/src/main/java/com/amatkivskiy/gitter/sdk/samples)
500505

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313

1414
allprojects {
15-
version '1.6.0'
15+
version '1.6.1'
1616

1717
repositories {
1818
jcenter()

library/async/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ artifacts {
2020
publish {
2121
groupId = 'com.github.amatkivskiy'
2222
artifactId = 'gitter.sdk.async'
23-
publishVersion = '1.6.0'
23+
publishVersion = '1.6.1'
2424
desc = 'Gitter.im Java SDK that facilitates communication with Gitter API and Gitter Faye API'
2525
licences = ['MIT']
2626
website = 'https://github.com/Gitteroid/GitterJavaSDK'
@@ -32,6 +32,6 @@ dependencies {
3232
compile project(':library:core')
3333
// compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
3434

35-
compile 'com.squareup.okio:okio:1.6.0'
36-
compile 'com.squareup.okhttp3:okhttp:3.5.0'
35+
compile 'com.squareup.okio:okio:1.13.0'
36+
compile 'com.squareup.okhttp3:okhttp:3.9.1'
3737
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ void searchUsers(
5757
void searchUsers(@Query("q") String searchTerm, Callback<SearchUsersResponse> callback);
5858

5959
// Rooms Api
60+
@POST("/rooms")
61+
@FormUrlEncoded
62+
void getRoomIdByUri(@Field("uri") String uri, Callback<RoomResponse> callback);
63+
6064
@GET("/rooms/{roomId}")
6165
void getRoomById(@Path("roomId") String roomId, Callback<RoomResponse> callback);
6266

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ public void failure(RetrofitError error) {
8787
}
8888

8989
// Rooms API
90+
public void getRoomIdByUri(String uri, Callback<RoomResponse> callback) {
91+
api.getRoomIdByUri(uri, callback);
92+
}
93+
9094
public void getRoomUsers(String roomId, Callback<List<UserResponse>> callback) {
9195
api.getRoomUsers(roomId, callback);
9296
}

library/rx/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ artifacts {
2929
publish {
3030
groupId = 'com.github.amatkivskiy'
3131
artifactId = 'gitter.sdk.rx'
32-
publishVersion = '1.6.0'
32+
publishVersion = '1.6.1'
3333
desc = 'Gitter.im RxJava SDK that facilitates communication with Gitter API'
3434
licences = ['MIT']
3535
website = 'https://github.com/Gitteroid/GitterJavaSDK'
@@ -38,9 +38,9 @@ publish {
3838
}
3939

4040
dependencies {
41-
// compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
42-
compile project(':library:core')
43-
compile 'io.reactivex:rxjava:1.1.0'
41+
compile 'com.github.amatkivskiy:gitter.sdk.core:1.6.0'
42+
// compile project(':library:core')
43+
compile 'io.reactivex:rxjava:1.3.4'
4444

4545
testCompile 'org.mockito:mockito-core:2.1.0-RC.1'
4646
testCompile 'junit:junit:4.12'

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public interface RxGitterApi {
5050
Observable<SearchUsersResponse> searchUsers(@Query("q") String searchTerm);
5151

5252
// Rooms API
53+
@POST("/rooms")
54+
@FormUrlEncoded
55+
Observable<RoomResponse> getRoomIdByUri(@Field("uri") String uri);
56+
5357
@GET("/rooms/{roomId}")
5458
Observable<RoomResponse> getRoomById(@Path("roomId") String roomId);
5559

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public List<UserResponse> call(SearchUsersResponse searchUsersResponse) {
7272
}
7373

7474
// Rooms API
75+
public Observable<RoomResponse> getRoomIdByUri(String uri) {
76+
return api.getRoomIdByUri(uri);
77+
}
78+
7579
public Observable<RoomResponse> getRoomById(String roomId) {
7680
return api.getRoomById(roomId);
7781
}

library/sync/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ artifacts {
2020
publish {
2121
groupId = 'com.github.amatkivskiy'
2222
artifactId = 'gitter.sdk.sync'
23-
publishVersion = '1.6.0'
23+
publishVersion = '1.6.1'
2424
desc = 'Gitter.im Java SDK that facilitates communication with Gitter API'
2525
licences = ['MIT']
2626
website = 'https://github.com/Gitteroid/GitterJavaSDK'

0 commit comments

Comments
 (0)