From 02575643fd43e1aa8d097fad66476aed0d0c5787 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 10 Dec 2024 20:03:31 +0000 Subject: [PATCH 1/3] chore: bump version number --- CONTRIBUTING.md | 2 +- README.md | 6 +++--- gradle.properties | 2 +- .../io/ably/lib/test/realtime/RealtimeHttpHeaderTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5663e06fb..40648b3fc 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.46.aar') +implementation files('libs/ably-android-1.2.47.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 25ecbbb19..4ded4bcbf 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.46' +implementation 'io.ably:ably-java:1.2.47' ``` For [Android](https://mvnrepository.com/artifact/io.ably/ably-android/latest): ```groovy -implementation 'io.ably:ably-android:1.2.46' +implementation 'io.ably:ably-android:1.2.47' ``` 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: @@ -512,7 +512,7 @@ Add the following dependency to your `build.gradle` file: ```groovy dependencies { - runtimeOnly("io.ably:network-client-okhttp:1.2.46") + runtimeOnly("io.ably:network-client-okhttp:1.2.47") } ``` diff --git a/gradle.properties b/gradle.properties index 50eee5e9e..948597a6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=io.ably -VERSION_NAME=1.2.46 +VERSION_NAME=1.2.47 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 350957090..690a96b35 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.46 jre/" + System.getProperty("java.version"))); + Collections.singletonList("ably-java/1.2.47 jre/" + System.getProperty("java.version"))); /* Spec RTN2a */ assertEquals("Verify correct format", requestParameters.get("format"), From 64d51f7981afb9a5fa7acf3769375d096f7fe116 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 10 Dec 2024 20:06:04 +0000 Subject: [PATCH 2/3] chore: update `CHANGELOG.md` --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0109b7dee..0b22dec9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Change Log +## [1.2.47](https://github.com/ably/ably-java/tree/v1.2.47) + +[Full Changelog](https://github.com/ably/ably-java/compare/v1.2.46...v1.2.47) + +**Fixed bugs:** + +- Java SDK - Duplicate messages on rewind after 1.2.34 [\#1050](https://github.com/ably/ably-java/issues/1050) + ## [1.2.46](https://github.com/ably/ably-java/tree/v1.2.46) [Full Changelog](https://github.com/ably/ably-java/compare/v1.2.45...v1.2.46) From 06cf9b7a6f2bed503fa611a25b1b811229da9925 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 10 Dec 2024 20:06:31 +0000 Subject: [PATCH 3/3] chore: add manual release GitHub action --- .github/workflows/release.yaml | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 000000000..1ff3f6656 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,39 @@ +name: Manual Release to Maven Central + +on: + workflow_dispatch: + +jobs: + run-on-release: + runs-on: ubuntu-latest + + steps: + # Ensure the workflow is being run for a published release + - name: Validate Release + run: | + if [ -z "${{ github.event.release.tag_name }}" ]; then + echo "This workflow must be run in the context of a published release."; + exit 1; + fi + echo "Running workflow for release: ${{ github.event.release.tag_name }}"; + + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 + + - name: Publish and release to Maven Central + run: ./gradlew publishAndReleaseToMavenCentral + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}