diff --git a/CHANGELOG.md b/CHANGELOG.md index 953b13fb0..ca7a915db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Change Log +## [1.2.43](https://github.com/ably/ably-java/tree/v1.2.43) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.42...v1.2.43) + +**Implemented enhancements:** + +- Expand proxy support: Authenticated Proxy and Websockets \(`HTTP CONNECT` tunnel\) [\#120](https://github.com/ably/ably-java/issues/120) + +**Merged pull requests:** + +- feat: introduced retry rules for flaky android push tests [\#1036](https://github.com/ably/ably-java/pull/1036) ([ttypic](https://github.com/ttypic)) +- feat: OkHttp implementation for making HTTP calls and WebSocket connections [\#1035](https://github.com/ably/ably-java/pull/1035) ([ttypic](https://github.com/ttypic)) +- chore: update gradle wrapper [\#1034](https://github.com/ably/ably-java/pull/1034) ([ttypic](https://github.com/ttypic)) + ## [1.2.42](https://github.com/ably/ably-java/tree/v1.2.42) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.41...v1.2.42) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ae9624b6f..b43005fbe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -219,7 +219,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.42.aar') +implementation files('libs/ably-android-1.2.43.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 449ec77ea..fe36de9e4 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.42' +implementation 'io.ably:ably-java:1.2.43' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.42' +implementation 'io.ably:ably-android:1.2.43' ``` 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/gradle.properties b/gradle.properties index b24da7ddf..9cddab77b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=io.ably -VERSION_NAME=1.2.42 +VERSION_NAME=1.2.43 POM_INCEPTION_YEAR=2015 POM_URL=https://github.com/ably/ably-java 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 85d897bd3..2cfdde3af 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.42 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.43 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"),