diff --git a/CHANGELOG.md b/CHANGELOG.md index b774c9151..5ecd466a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [v1.1.5](https://github.com/ably/ably-java/tree/v1.1.5) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.1.4...v1.1.5) + +**Fixed bugs:** + +- WebSocketTransport: don't null the wsConnection in onClose\(\) [\#500](https://github.com/ably/ably-java/pull/500) ([paddybyers](https://github.com/paddybyers)) + ## [v1.1.4](https://github.com/ably/ably-java/tree/v1.1.4) [Full Changelog](https://github.com/ably/ably-java/compare/v1.1.3...v1.1.4) diff --git a/README.md b/README.md index 92b0b9041..5cbeeb8c0 100644 --- a/README.md +++ b/README.md @@ -30,13 +30,13 @@ Reference the library by including a compile dependency reference in your gradle For [Java](https://bintray.com/ably-io/ably/ably-java/_latestVersion): ``` -compile 'io.ably:ably-java:1.1.4' +compile 'io.ably:ably-java:1.1.5' ``` For [Android](https://bintray.com/ably-io/ably/ably-android/_latestVersion): ``` -compile 'io.ably:ably-android:1.1.4' +compile 'io.ably:ably-android:1.1.5' ``` The library is hosted on the [Jcenter repository](https://bintray.com/ably-io/ably), so you need to ensure that the repo is referenced also; IDEs will typically include this by default: @@ -567,9 +567,9 @@ This library uses [semantic versioning](http://semver.org/). For each release, t ### Release notes -* Create a branch for the release, named like `release-1.1.4` +* Create a branch for the release, named like `release-1.1.5` * Replace all references of the current version number with the new version number (check this file [README.md](./README.md) and [common.gradle](./common.gradle)) and commit the changes -* Run [`github_changelog_generator`](https://github.com/skywinder/Github-Changelog-Generator) to update the [CHANGELOG](./CHANGELOG.md): `github_changelog_generator -u ably -p ably-java --header-label="# Changelog" --release-branch=release-1.1.4 --future-release=v1.0.8` +* Run [`github_changelog_generator`](https://github.com/skywinder/Github-Changelog-Generator) to update the [CHANGELOG](./CHANGELOG.md): `github_changelog_generator -u ably -p ably-java --header-label="# Changelog" --release-branch=release-1.1.5 --future-release=v1.0.8` * Commit [CHANGELOG](./CHANGELOG.md) * Add a tag and push to origin such as `git tag v1.1.0; git push origin v1.1.0` * Make a PR against `develop` @@ -583,12 +583,12 @@ This library uses [semantic versioning](http://semver.org/). For each release, t ### Publishing to JCenter (Maven) -* Go to the home page for the package; eg https://bintray.com/ably-io/ably/ably-java. Select [New version](https://bintray.com/ably-io/ably/ably-java/new/version), enter the new version such as "1.1.4" in name and save +* Go to the home page for the package; eg https://bintray.com/ably-io/ably/ably-java. Select [New version](https://bintray.com/ably-io/ably/ably-java/new/version), enter the new version such as "1.1.5" in name and save * Run `./gradlew java:assembleRelease` locally to generate the files -* Open local relative folder such as `./java/build/release/1.1.4/io/ably/ably-java/1.1.4` -* Then go to the new version in JFrog Bintray; eg https://bintray.com/ably-io/ably/ably-java/1.1.4, then click on the link to upload via the UI in the "Upload files" section -* Type in `io/ably/ably-java/1.1.4` into "Target Repository Path" ensuring the correct version is included. The drag in the files in `java/build/release/1.1.4/`. Upload all the `.jar` files and the `.pom` file. -* You will see a notice "You have 4 unpublished item(s) for this version", make sure you click "Publish". Wait a few minutes and check that your version has all the necessary files at https://bintray.com/ably-io/ably/ably-java/1.1.4?sort=&order=#files/io/ably/ably-java/1.1.4 for example. +* Open local relative folder such as `./java/build/release/1.1.5/io/ably/ably-java/1.1.5` +* Then go to the new version in JFrog Bintray; eg https://bintray.com/ably-io/ably/ably-java/1.1.5, then click on the link to upload via the UI in the "Upload files" section +* Type in `io/ably/ably-java/1.1.5` into "Target Repository Path" ensuring the correct version is included. The drag in the files in `java/build/release/1.1.5/`. Upload all the `.jar` files and the `.pom` file. +* You will see a notice "You have 4 unpublished item(s) for this version", make sure you click "Publish". Wait a few minutes and check that your version has all the necessary files at https://bintray.com/ably-io/ably/ably-java/1.1.5?sort=&order=#files/io/ably/ably-java/1.1.5 for example. * Update the README text in Bintray. ### Create release on Github @@ -597,7 +597,7 @@ This library uses [semantic versioning](http://semver.org/). For each release, t Similarly for the Android release at https://bintray.com/ably-io/ably/ably-android. Run `gradle android:assembleRelease` locally to generate the files, and drag in the files in -`./android/build/release/1.1.4/io/ably/ably-android/1.1.4`. In this case upload the `.jar` files, the `.pom` file and the `.aar` file. +`./android/build/release/1.1.5/io/ably/ably-android/1.1.5`. In this case upload the `.jar` files, the `.pom` file and the `.aar` file. ## Support, feedback and troubleshooting diff --git a/common.gradle b/common.gradle index adc9b3c06..63d030daf 100644 --- a/common.gradle +++ b/common.gradle @@ -3,7 +3,7 @@ repositories { } group = 'io.ably' -version = '1.1.4' +version = '1.1.5' description = """Ably java client library""" tasks.withType(Javadoc) {