Skip to content

Commit b59f806

Browse files
umair-ablyclaude
andcommitted
Restructure modules for the PubSub package split: java/android -> core/core-android
Applies the first step of PDR-091b to this repo: the shared implementation becomes the new internal core artifacts, published under the io.ably.pubsub group at the new 2.0.0 major. - The `java` module becomes `core`, publishing io.ably.pubsub:core (jar). - The `android` module becomes `core-android`, publishing io.ably.pubsub:core-android (aar). - GROUP moves to io.ably.pubsub and VERSION_NAME to 2.0.0 for everything this repo publishes (liveobjects, pubsub-adapter and network-client-* move group alongside, per the rollout plan). - Both core POMs state explicitly that they are internal implementation artifacts for Ably's own device/server packages, not for direct use. - liveobjects, pubsub-adapter, uts and examples retarget their project dependencies; CI workflows, CONTRIBUTING and the uts README follow the new task paths. The io.ably:ably-java and io.ably:ably-android artifacts are never published from this branch again; 1.x fixes ship from a maintenance branch per PDR-091b. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 parent 74d267f commit b59f806

52 files changed

Lines changed: 37 additions & 37 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/emulate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ jobs:
5050
arch: ${{ steps.get-avd-arch.outputs.arch }}
5151
target: default
5252
# Print emulator logs if tests fail
53-
script: ./gradlew :android:connectedAndroidTest ${{ matrix.android-api-level == 19 && '-PhttpURLConnection' || '' }} || (adb logcat -d System.out:I && exit 1)
53+
script: ./gradlew :core-android:connectedAndroidTest ${{ matrix.android-api-level == 19 && '-PhttpURLConnection' || '' }} || (adb logcat -d System.out:I && exit 1)
5454

5555
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
5656
if: always()
5757
with:
5858
name: android-build-reports-${{ matrix.android-api-level }}
59-
path: android/build/reports/
59+
path: core-android/build/reports/

‎.github/workflows/integration-test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
- name: Set up Gradle
2828
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
2929

30-
- run: ./gradlew :java:testRestSuite -PhttpURLConnection
30+
- run: ./gradlew :core:testRestSuite -PhttpURLConnection
3131

3232
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
3333
if: always()
3434
with:
3535
name: java-build-reports-rest
36-
path: java/build/reports/
36+
path: core/build/reports/
3737

3838
check-realtime-httpurlconnection:
3939
runs-on: ubuntu-latest
@@ -54,13 +54,13 @@ jobs:
5454
- name: Set up Gradle
5555
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
5656

57-
- run: ./gradlew :java:testRealtimeSuite -PhttpURLConnection
57+
- run: ./gradlew :core:testRealtimeSuite -PhttpURLConnection
5858

5959
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
6060
if: always()
6161
with:
6262
name: java-build-reports-realtime
63-
path: java/build/reports/
63+
path: core/build/reports/
6464
check-rest-okhttp:
6565
runs-on: ubuntu-latest
6666
permissions:
@@ -80,7 +80,7 @@ jobs:
8080
- name: Set up Gradle
8181
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
8282

83-
- run: ./gradlew :java:testRestSuite
83+
- run: ./gradlew :core:testRestSuite
8484

8585
check-realtime-okhttp:
8686
runs-on: ubuntu-latest
@@ -101,7 +101,7 @@ jobs:
101101
- name: Set up Gradle
102102
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3
103103

104-
- run: ./gradlew :java:testRealtimeSuite
104+
- run: ./gradlew :core:testRealtimeSuite
105105

106106
check-liveobjects:
107107
runs-on: ubuntu-latest

‎.github/workflows/javadoc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ jobs:
3939
- name: Upload Documentation
4040
uses: ably/sdk-upload-action@4e694297f208b72b5a9f6b1248a1556f19f821d6 # v2
4141
with:
42-
sourcePath: java/build/docs/javadoc
42+
sourcePath: core/build/docs/javadoc
4343
githubToken: ${{ secrets.GITHUB_TOKEN }}
4444
artifactName: javadoc

‎CONTRIBUTING.md‎

Lines changed: 9 additions & 9 deletions

‎android/gradle.properties‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎core-android/gradle.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
POM_ARTIFACT_ID=core-android
2+
POM_NAME=Ably Pub/Sub core (Android)
3+
POM_DESCRIPTION=Internal implementation artifact for Ably's own Pub/Sub device/server packages. Not intended for direct use: depend on io.ably.pubsub:device instead.
4+
POM_PACKAGING=aar

android/src/androidTest/java/io/ably/lib/push/LocalDeviceStorageTest.java renamed to core-android/src/androidTest/java/io/ably/lib/push/LocalDeviceStorageTest.java

File renamed without changes.

0 commit comments

Comments
 (0)