From 6689387e00285fec151d5ca022e1de788eaf665e Mon Sep 17 00:00:00 2001 From: Kacper Kluka Date: Thu, 5 May 2022 07:06:01 +0200 Subject: [PATCH 1/2] Bump version number --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- common.gradle | 2 +- .../io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d97522d6..48d22b644 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.11.aar') +implementation files('libs/ably-android-1.2.12.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 c31273c40..af215f860 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,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.11' +implementation 'io.ably:ably-java:1.2.12' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.11' +implementation 'io.ably:ably-android:1.2.12' ``` 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/common.gradle b/common.gradle index f86dfe208..9f1d26ecd 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.2.11' +version = '1.2.12' 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 9bab2d08a..ca4ebcd15 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.11 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.12 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"), From f96dca0cb7d132a40381fac74f7b1ebad80eb5aa Mon Sep 17 00:00:00 2001 From: Kacper Kluka Date: Thu, 5 May 2022 07:14:14 +0200 Subject: [PATCH 2/2] Add change log entry --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ca1060e..74cde0801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Change Log +## [v1.2.12](https://github.com/ably/ably-java/tree/v1.2.12) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.11...v1.2.12) + +**Fixed bugs:** + +- Cannot automatically re-enter channel due to mismatched connectionId [\#761](https://github.com/ably/ably-java/issues/761) +- Ensure that weak SSL/TLS protocols are not used [\#749](https://github.com/ably/ably-java/issues/749) + ## [v1.2.11](https://github.com/ably/ably-java/tree/v1.2.11) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.10...v1.2.11)