From ec9335fc33eadca1011724edcf847c280677fff4 Mon Sep 17 00:00:00 2001 From: Andy Ford Date: Thu, 6 Jul 2023 08:21:44 +0100 Subject: [PATCH 1/4] bump version number --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- android/build.gradle | 2 +- common.gradle | 2 +- .../io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bc017fb29..ed48565de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -191,7 +191,7 @@ You may wish to make changes to Ably Java or Ably Android, and test it immediate - Open the directory printed from the output of that command. Inside that folder, get the `ably-android-x.y.z.aar`, and place it your Android project's `libs/` directory. Create this directory if it doesn't exist. - Add an `implementation` dependency on the `.aar`: ```groovy -implementation files('libs/ably-android-1.2.30.aar') +implementation files('libs/ably-android-1.2.31.aar') ``` - Add the `implementation` (not `testImplementation`) dependencies found in `dependencies.gradle` to your project. This is because the `.aar` does not contain dependencies. - Build/run your application. diff --git a/README.md b/README.md index ce1e3848f..f1298d028 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ Include the library by adding an `implementation` reference to `dependencies` bl For [Java](https://mvnrepository.com/artifact/io.ably/ably-java/latest): ```groovy -implementation 'io.ably:ably-java:1.2.30' +implementation 'io.ably:ably-java:1.2.31' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.30' +implementation 'io.ably:ably-android:1.2.31' ``` The library is hosted on [Maven Central](https://mvnrepository.com/repos/central), so you need to ensure that the repository is referenced also; IDEs will typically include this by default: diff --git a/android/build.gradle b/android/build.gradle index 87d7ba09a..f5b4cfbbb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -31,7 +31,7 @@ android { minSdkVersion 19 targetSdkVersion 30 // This MUST be incremented by 1 on each ably-java release - versionCode 5 + versionCode 6 versionName version setProperty('archivesBaseName', "ably-android-$versionName") testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' diff --git a/common.gradle b/common.gradle index 926dcab63..76f80dd4e 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.2.30' +version = '1.2.31' description = 'Ably java client library' tasks.withType(Javadoc) { diff --git a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java index 91152a132..e3f13b0c4 100644 --- a/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java +++ b/lib/src/test/java/io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java @@ -88,7 +88,7 @@ public void realtime_websocket_param_test() { * Defaults.ABLY_AGENT_PARAM, as ultimately the request param has been derived from those values. */ assertEquals("Verify correct lib version", requestParameters.get("agent"), - Collections.singletonList("ably-java/1.2.30 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.31 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"), From 55f2c5ef92ceb343dfe5c3399f1593357c0cb3a6 Mon Sep 17 00:00:00 2001 From: Andy Ford Date: Thu, 6 Jul 2023 08:28:19 +0100 Subject: [PATCH 2/4] update changelog --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af6d94da..158ffb61e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Change Log +## [1.2.31](https://github.com/ably/ably-java/tree/v1.2.31) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.30...v1.2.31) + +**Fixed bugs:** + +- Error code for channel attachment timed out [\#959](https://github.com/ably/ably-java/issues/959) +- Error code for message decoding failure [\#958](https://github.com/ably/ably-java/issues/958) +- Fix incremental backoff while reconnecting [\#954](https://github.com/ably/ably-java/issues/954) + +**Merged pull requests:** + +- fix: use appropriate error code for channel attachment timeout [\#961](https://github.com/ably/ably-java/pull/961) ([AndyTWF](https://github.com/AndyTWF)) +- fix: use error code 40013 for message decoding failures [\#960](https://github.com/ably/ably-java/pull/960) ([AndyTWF](https://github.com/AndyTWF)) +- Fix incremental backoff jitter [\#955](https://github.com/ably/ably-java/pull/955) ([sacOO7](https://github.com/sacOO7)) + ## [1.2.30](https://github.com/ably/ably-java/tree/v1.2.30) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.29...v1.2.30) From 6d7d845696e493aeb8877c2543e94d09fbdd4b72 Mon Sep 17 00:00:00 2001 From: Andy Ford Date: Thu, 6 Jul 2023 09:43:44 +0100 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 158ffb61e..32b7686d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,12 +9,14 @@ - Error code for channel attachment timed out [\#959](https://github.com/ably/ably-java/issues/959) - Error code for message decoding failure [\#958](https://github.com/ably/ably-java/issues/958) - Fix incremental backoff while reconnecting [\#954](https://github.com/ably/ably-java/issues/954) +- Add missing clientOptions [\#956](https://github.com/ably/ably-java/issues/956) **Merged pull requests:** - fix: use appropriate error code for channel attachment timeout [\#961](https://github.com/ably/ably-java/pull/961) ([AndyTWF](https://github.com/AndyTWF)) - fix: use error code 40013 for message decoding failures [\#960](https://github.com/ably/ably-java/pull/960) ([AndyTWF](https://github.com/AndyTWF)) - Fix incremental backoff jitter [\#955](https://github.com/ably/ably-java/pull/955) ([sacOO7](https://github.com/sacOO7)) +- Add missing clientOptions [\#957](https://github.com/ably/ably-java/pull/957) ([sacOO7](https://github.com/sacOO7)) ## [1.2.30](https://github.com/ably/ably-java/tree/v1.2.30) From 1959a9c58d89cc3f2675e80ae8a6b55bb7c9e07a Mon Sep 17 00:00:00 2001 From: Andy Ford Date: Thu, 6 Jul 2023 10:19:13 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md Co-authored-by: Owen Pearson <48608556+owenpearson@users.noreply.github.com> --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b7686d9..5a6006fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,10 @@ **Fixed bugs:** -- Error code for channel attachment timed out [\#959](https://github.com/ably/ably-java/issues/959) -- Error code for message decoding failure [\#958](https://github.com/ably/ably-java/issues/958) +- Update error code for channel attachment timed out [\#959](https://github.com/ably/ably-java/issues/959) +- Update error code for message decoding failure [\#958](https://github.com/ably/ably-java/issues/958) - Fix incremental backoff while reconnecting [\#954](https://github.com/ably/ably-java/issues/954) -- Add missing clientOptions [\#956](https://github.com/ably/ably-java/issues/956) +- Add `suspendedRetryTimeout` and `httpMaxRetryDuration` client options [\#956](https://github.com/ably/ably-java/issues/956) **Merged pull requests:**