From 393ca5221648df69c231646e2df8910797083d03 Mon Sep 17 00:00:00 2001 From: evgeny Date: Wed, 3 Apr 2024 15:56:35 +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 262f84b3b..b25818273 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.35.aar') +implementation files('libs/ably-android-1.2.36.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 bf63f9afc..8a28067b6 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.35' +implementation 'io.ably:ably-java:1.2.36' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.35' +implementation 'io.ably:ably-android:1.2.36' ``` 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 22e142541..247375691 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 10 + versionCode 11 versionName version setProperty('archivesBaseName', "ably-android-$versionName") testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' diff --git a/common.gradle b/common.gradle index 06a4af8c5..a47c587e8 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.2.35' +version = '1.2.36' 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 12793081e..22105fb93 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.35 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.36 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"), From 47559d6375f176954cab9b17f72b4f8f7ae91d66 Mon Sep 17 00:00:00 2001 From: evgeny Date: Wed, 3 Apr 2024 15:56:51 +0100 Subject: [PATCH 2/2] docs: update `CHANGELOG.md` --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bb77b18a..dcf9ff03f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## [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) + +**Closed issues:** + +- Push Notification corner cases [\#993](https://github.com/ably/ably-java/issues/993) +- Protocol-v2: readd recoveryKey to make this a non-breaking change [\#868](https://github.com/ably/ably-java/issues/868) + +**Merged pull requests:** + +- \[ECO-4706\] fix: push notifications corner cases [\#994](https://github.com/ably/ably-java/pull/994) ([ttypic](https://github.com/ttypic)) + ## [1.2.35](https://github.com/ably/ably-java/tree/v1.2.35) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.34...v1.2.35)