Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.2.34 #988

Merged
merged 6 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
# Change Log

## [1.2.34](https://github.com/ably/ably-java/tree/v1.2.34)

[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.33...v1.2.34)

**Fixed bugs:**

- Should send `DETACH` after receiving `ATTACHED` while in the `DETACHING` or `DETACHED` state \(`RTL5k`\) [\#846](https://github.com/ably/ably-java/issues/846)

**Closed issues:**

- LocalDevice reset will cause ClassCastException [\#985](https://github.com/ably/ably-java/issues/985)
sacOO7 marked this conversation as resolved.
Show resolved Hide resolved
- Implement no-connection-serial \( Add tests \) [\#981](https://github.com/ably/ably-java/issues/981)
- Implement no-connection-serial - \( remove all references to connection serial \) [\#976](https://github.com/ably/ably-java/issues/976)
- Implement no-connection-serial - \( update internal presence \) [\#975](https://github.com/ably/ably-java/issues/975)
- Implement no-connection-serial - \( recovery key \) [\#974](https://github.com/ably/ably-java/issues/974)
- DeviceSecret key is required by protocol v2.0 [\#845](https://github.com/ably/ably-java/issues/845)

**Merged pull requests:**

- Fix shared pref storage [\#986](https://github.com/ably/ably-java/pull/986) ([sacOO7](https://github.com/sacOO7))
- Feature/no connection serial [\#983](https://github.com/ably/ably-java/pull/983) ([sacOO7](https://github.com/sacOO7))

## [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)
Expand Down
8 changes: 6 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.33.aar')
implementation files('libs/ably-android-1.2.34.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.
Expand All @@ -203,7 +203,11 @@ This library uses [semantic versioning](http://semver.org/). For each release, t
1. Create a branch for the release, named like `release/1.2.4` (where `1.2.4` is what you're releasing, being the new version)
2. Replace all references of the current version number with the new version number (check the [README.md](./README.md) and [common.gradle](./common.gradle)) and commit the changes
a. Increment the `versionCode` in the Android project's `build.gradle` by 1
3. Run the [GitHub Changelog Generator](https://github.com/github-changelog-generator/github-changelog-generator) to update the [CHANGELOG](./CHANGELOG.md): something like: `github_changelog_generator -u ably -p ably-java --since-tag v1.2.3 --output delta.md` and then manually merge the delta contents in to the main change log (where `1.2.3` is the preceding release)
3. Run [`github_changelog_generator`](https://github.com/github-changelog-generator/github-changelog-generator) to automate the update of the [CHANGELOG](./CHANGELOG.md). This may require some manual intervention, both in terms of how the command is run and how the change log file is modified. Your mileage may vary:
- The command you will need to run will look something like this: `github_changelog_generator -u ably -p ably-java --since-tag v1.2.3 --output delta.md --token $GITHUB_TOKEN_WITH_REPO_ACCESS`. Generate token [here](https://github.com/settings/tokens/new?description=GitHub%20Changelog%20Generator%20token).
- Using the command above, `--output delta.md` writes changes made after `--since-tag` to a new file.
- The contents of that new file (`delta.md`) then need to be manually inserted at the top of the `CHANGELOG.md`, changing the "Unreleased" heading and linking with the current version numbers.
- Also ensure that the "Full Changelog" link points to the new version tag instead of the `HEAD`.
4. Commit [CHANGELOG](./CHANGELOG.md)
5. Make a PR against `main`
6. Once the PR is approved, merge it into `main`
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.33'
implementation 'io.ably:ably-java:1.2.34'
```

For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest):

```groovy
implementation 'io.ably:ably-android:1.2.33'
implementation 'io.ably:ably-android:1.2.34'
```

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:
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ android {
minSdkVersion 19
targetSdkVersion 30
// This MUST be incremented by 1 on each ably-java release
versionCode 8
versionCode 9
versionName version
setProperty('archivesBaseName', "ably-android-$versionName")
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
Expand Down
2 changes: 1 addition & 1 deletion common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repositories {
}

group = 'io.ably'
version = '1.2.33'
version = '1.2.34'
description = 'Ably java client library'

tasks.withType(Javadoc) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.33 jre/" + System.getProperty("java.version")));
Collections.singletonList("ably-java/1.2.34 jre/" + System.getProperty("java.version")));

/* Spec RTN2a */
assertEquals("Verify correct format", requestParameters.get("format"),
Expand Down
Loading