From db08bc224a7a6342c93b503f95b13869ae294d79 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 9 Apr 2024 19:13:41 +0100 Subject: [PATCH 1/2] chore: 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 b25818273..5489b8e97 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.36.aar') +implementation files('libs/ably-android-1.2.37.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 8a28067b6..ecb63e221 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.36' +implementation 'io.ably:ably-java:1.2.37' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.36' +implementation 'io.ably:ably-android:1.2.37' ``` 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 247375691..c41d6b7b7 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 11 + versionCode 12 versionName version setProperty('archivesBaseName', "ably-android-$versionName") testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' diff --git a/common.gradle b/common.gradle index a47c587e8..b95013f2a 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.2.36' +version = '1.2.37' 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 22105fb93..0059c91eb 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.36 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.37 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"), From 2776b606a79aa5db79f5916a2e3bd16abd597f83 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 9 Apr 2024 19:14:06 +0100 Subject: [PATCH 2/2] docs: update `CHANGELOG.md` --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf9ff03f..109b14422 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [1.2.37](https://github.com/ably/ably-java/tree/v1.2.37) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.36...v1.2.37) + +**Fixed bugs:** + +- Fix HttpRequest & HttpRetry timeouts [\#310](https://github.com/ably/ably-java/issues/310) + ## [1.2.36](https://github.com/ably/ably-java/tree/v1.2.36) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.35...v1.2.36)