diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c93f79d6..28fa9c123 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## [1.2.33](https://github.com/ably/ably-java/tree/v1.2.33) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.32...v1.2.33) + +**Closed issues:** + +- Throw exception on `released` Ably Channel methods [\#971](https://github.com/ably/ably-java/issues/971) + +**Merged pull requests:** + +- fix: prevent reattaching of detached channels [\#977](https://github.com/ably/ably-java/pull/977) ([ttypic](https://github.com/ttypic)) +- feat: throw exception when trying to attach on released channel [\#973](https://github.com/ably/ably-java/pull/973) ([ttypic](https://github.com/ttypic)) +- fix: deviceId and deviceToken consistence [\#972](https://github.com/ably/ably-java/pull/972) ([ttypic](https://github.com/ttypic)) + ## [1.2.32](https://github.com/ably/ably-java/tree/v1.2.32) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.31...v1.2.32) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae319517f..fe64c5c79 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.32.aar') +implementation files('libs/ably-android-1.2.33.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 f515bc229..59ef5fea4 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.32' +implementation 'io.ably:ably-java:1.2.33' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.32' +implementation 'io.ably:ably-android:1.2.33' ``` 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 908a3d8fa..4d067d0fb 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 7 + versionCode 8 versionName version setProperty('archivesBaseName', "ably-android-$versionName") testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' diff --git a/common.gradle b/common.gradle index e14ab5d5a..2c3676238 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.2.32' +version = '1.2.33' 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 5d3a67f0b..07e945629 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.32 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.33 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"),