From 71ea63672f2a28151ad30aab58afef6dc2a0b347 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 26 Aug 2025 13:51:14 +0100 Subject: [PATCH 1/3] chore: rename `ObjectsPlugin` to `LiveObjectsPlugin` --- .../java/io/ably/lib/realtime/Channel.java | 6 ++-- .../java/io/ably/lib/realtime/Channel.java | 6 ++-- ...ectsPlugin.java => LiveObjectsPlugin.java} | 4 +-- .../io/ably/lib/objects/ObjectsHelper.java | 6 ++-- .../io/ably/lib/realtime/AblyRealtime.java | 18 ++++++------ .../io/ably/lib/realtime/ChannelBase.java | 28 +++++++++---------- .../java/io/ably/lib/realtime/Connection.java | 6 ++-- .../ably/lib/transport/ConnectionManager.java | 12 ++++---- ...sPlugin.kt => DefaultLiveObjectsPlugin.kt} | 2 +- 9 files changed, 44 insertions(+), 44 deletions(-) rename lib/src/main/java/io/ably/lib/objects/{ObjectsPlugin.java => LiveObjectsPlugin.java} (95%) rename live-objects/src/main/kotlin/io/ably/lib/objects/{DefaultObjectsPlugin.kt => DefaultLiveObjectsPlugin.kt} (91%) diff --git a/android/src/main/java/io/ably/lib/realtime/Channel.java b/android/src/main/java/io/ably/lib/realtime/Channel.java index 9d5ee6ab0..baf086cbc 100644 --- a/android/src/main/java/io/ably/lib/realtime/Channel.java +++ b/android/src/main/java/io/ably/lib/realtime/Channel.java @@ -3,7 +3,7 @@ import io.ably.lib.types.AblyException; import io.ably.lib.types.ChannelOptions; import io.ably.lib.push.PushChannel; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; public class Channel extends ChannelBase { @@ -14,8 +14,8 @@ public class Channel extends ChannelBase { */ public final PushChannel push; - Channel(AblyRealtime ably, String name, ChannelOptions options, ObjectsPlugin objectsPlugin) throws AblyException { - super(ably, name, options, objectsPlugin); + Channel(AblyRealtime ably, String name, ChannelOptions options, LiveObjectsPlugin liveObjectsPlugin) throws AblyException { + super(ably, name, options, liveObjectsPlugin); this.push = ((io.ably.lib.rest.AblyRest) ably).channels.get(name, options).push; } diff --git a/java/src/main/java/io/ably/lib/realtime/Channel.java b/java/src/main/java/io/ably/lib/realtime/Channel.java index 0f1d9a53e..539d08adf 100644 --- a/java/src/main/java/io/ably/lib/realtime/Channel.java +++ b/java/src/main/java/io/ably/lib/realtime/Channel.java @@ -1,13 +1,13 @@ package io.ably.lib.realtime; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; import io.ably.lib.types.AblyException; import io.ably.lib.types.ChannelOptions; import org.jetbrains.annotations.Nullable; public class Channel extends ChannelBase { - Channel(AblyRealtime ably, String name, ChannelOptions options, @Nullable ObjectsPlugin objectsPlugin) throws AblyException { - super(ably, name, options, objectsPlugin); + Channel(AblyRealtime ably, String name, ChannelOptions options, @Nullable LiveObjectsPlugin liveObjectsPlugin) throws AblyException { + super(ably, name, options, liveObjectsPlugin); } public interface MessageListener extends ChannelBase.MessageListener {} diff --git a/lib/src/main/java/io/ably/lib/objects/ObjectsPlugin.java b/lib/src/main/java/io/ably/lib/objects/LiveObjectsPlugin.java similarity index 95% rename from lib/src/main/java/io/ably/lib/objects/ObjectsPlugin.java rename to lib/src/main/java/io/ably/lib/objects/LiveObjectsPlugin.java index be149843b..1f34cafdd 100644 --- a/lib/src/main/java/io/ably/lib/objects/ObjectsPlugin.java +++ b/lib/src/main/java/io/ably/lib/objects/LiveObjectsPlugin.java @@ -5,11 +5,11 @@ import org.jetbrains.annotations.NotNull; /** - * The ObjectsPlugin interface provides a mechanism for managing and interacting with + * The LiveObjectsPlugin interface provides a mechanism for managing and interacting with * live data objects in a real-time environment. It allows for the retrieval, disposal, and * management of Objects instances associated with specific channel names. */ -public interface ObjectsPlugin { +public interface LiveObjectsPlugin { /** * Retrieves an instance of RealtimeObjects associated with the specified channel name. diff --git a/lib/src/main/java/io/ably/lib/objects/ObjectsHelper.java b/lib/src/main/java/io/ably/lib/objects/ObjectsHelper.java index 38b000a11..81e7f3c08 100644 --- a/lib/src/main/java/io/ably/lib/objects/ObjectsHelper.java +++ b/lib/src/main/java/io/ably/lib/objects/ObjectsHelper.java @@ -12,11 +12,11 @@ public class ObjectsHelper { private static volatile ObjectsSerializer objectsSerializer; @Nullable - public static ObjectsPlugin tryInitializeObjectsPlugin(AblyRealtime ablyRealtime) { + public static LiveObjectsPlugin tryInitializeObjectsPlugin(AblyRealtime ablyRealtime) { try { - Class objectsImplementation = Class.forName("io.ably.lib.objects.DefaultObjectsPlugin"); + Class objectsImplementation = Class.forName("io.ably.lib.objects.DefaultLiveObjectsPlugin"); ObjectsAdapter adapter = new Adapter(ablyRealtime); - return (ObjectsPlugin) objectsImplementation + return (LiveObjectsPlugin) objectsImplementation .getDeclaredConstructor(ObjectsAdapter.class) .newInstance(adapter); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java index 7cc4480f2..174fcfbf6 100644 --- a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java +++ b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java @@ -6,7 +6,7 @@ import java.util.Map; import io.ably.lib.objects.ObjectsHelper; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; import io.ably.lib.rest.AblyRest; import io.ably.lib.rest.Auth; import io.ably.lib.transport.ConnectionManager; @@ -49,7 +49,7 @@ public class AblyRealtime extends AblyRest { * This field is initialized only if the LiveObjects plugin is present in the classpath. */ @Nullable - private final ObjectsPlugin objectsPlugin; + private final LiveObjectsPlugin liveObjectsPlugin; /** * Constructs a Realtime client object using an Ably API key or token string. @@ -74,9 +74,9 @@ public AblyRealtime(ClientOptions options) throws AblyException { final InternalChannels channels = new InternalChannels(); this.channels = channels; - objectsPlugin = ObjectsHelper.tryInitializeObjectsPlugin(this); + liveObjectsPlugin = ObjectsHelper.tryInitializeObjectsPlugin(this); - connection = new Connection(this, channels, platformAgentProvider, objectsPlugin); + connection = new Connection(this, channels, platformAgentProvider, liveObjectsPlugin); if (!StringUtils.isNullOrEmpty(options.recover)) { RecoveryKeyContext recoveryKeyContext = RecoveryKeyContext.decode(options.recover); @@ -122,8 +122,8 @@ public void close() { } connection.close(); - if (objectsPlugin != null) { - objectsPlugin.dispose(); + if (liveObjectsPlugin != null) { + liveObjectsPlugin.dispose(); } } @@ -204,7 +204,7 @@ public Channel get(final String channelName, final ChannelOptions channelOptions // We're not using computeIfAbsent because that requires Java 1.8. // Hence there's the slight inefficiency of creating newChannel when it may not be // needed because there is an existingChannel. - final Channel newChannel = new Channel(AblyRealtime.this, channelName, channelOptions, objectsPlugin); + final Channel newChannel = new Channel(AblyRealtime.this, channelName, channelOptions, liveObjectsPlugin); final Channel existingChannel = map.putIfAbsent(channelName, newChannel); if (existingChannel != null) { @@ -231,8 +231,8 @@ public void release(String channelName) { Log.e(TAG, "Unexpected exception detaching channel; channelName = " + channelName, e); } } - if (objectsPlugin != null) { - objectsPlugin.dispose(channelName); + if (liveObjectsPlugin != null) { + liveObjectsPlugin.dispose(channelName); } } diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java index 587a13fab..689c2b12c 100644 --- a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java +++ b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java @@ -14,7 +14,7 @@ import io.ably.lib.http.HttpCore; import io.ably.lib.http.HttpUtils; import io.ably.lib.objects.RealtimeObjects; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; import io.ably.lib.rest.RestAnnotations; import io.ably.lib.transport.ConnectionManager; import io.ably.lib.transport.ConnectionManager.QueuedMessage; @@ -95,16 +95,16 @@ public abstract class ChannelBase extends EventEmitter') to your dependency tree", 400, 40019) ); } - return objectsPlugin.getInstance(name); + return liveObjectsPlugin.getInstance(name); } public final RealtimeAnnotations annotations; @@ -147,11 +147,11 @@ private void setState(ChannelState newState, ErrorInfo reason, boolean resumed, } // cover states other than attached, ChannelState.attached already covered in setAttached - if (objectsPlugin != null && newState!= ChannelState.attached) { + if (liveObjectsPlugin != null && newState!= ChannelState.attached) { try { - objectsPlugin.handleStateChange(name, newState, false); + liveObjectsPlugin.handleStateChange(name, newState, false); } catch (Throwable t) { - Log.e(TAG, "Unexpected exception in objectsPlugin.handle", t); + Log.e(TAG, "Unexpected exception in liveObjectsPlugin.handle", t); } } @@ -449,11 +449,11 @@ private void setAttached(ProtocolMessage message) { } return; } - if (objectsPlugin != null) { + if (liveObjectsPlugin != null) { try { - objectsPlugin.handleStateChange(name, ChannelState.attached, message.hasFlag(Flag.has_objects)); + liveObjectsPlugin.handleStateChange(name, ChannelState.attached, message.hasFlag(Flag.has_objects)); } catch (Throwable t) { - Log.e(TAG, "Unexpected exception in objectsPlugin.handle", t); + Log.e(TAG, "Unexpected exception in liveObjectsPlugin.handle", t); } } if(state == ChannelState.attached) { @@ -1326,7 +1326,7 @@ else if(stateChange.current.equals(failureState)) { } } - ChannelBase(AblyRealtime ably, String name, ChannelOptions options, @Nullable ObjectsPlugin objectsPlugin) throws AblyException { + ChannelBase(AblyRealtime ably, String name, ChannelOptions options, @Nullable LiveObjectsPlugin liveObjectsPlugin) throws AblyException { Log.v(TAG, "RealtimeChannel(); channel = " + name); this.ably = ably; this.name = name; @@ -1336,9 +1336,9 @@ else if(stateChange.current.equals(failureState)) { this.attachResume = false; state = ChannelState.initialized; this.decodingContext = new DecodingContext(); - this.objectsPlugin = objectsPlugin; - if (objectsPlugin != null) { - objectsPlugin.getInstance(name); // Make objects instance ready to process sync messages + this.liveObjectsPlugin = liveObjectsPlugin; + if (liveObjectsPlugin != null) { + liveObjectsPlugin.getInstance(name); // Make objects instance ready to process sync messages } this.annotations = new RealtimeAnnotations( this, diff --git a/lib/src/main/java/io/ably/lib/realtime/Connection.java b/lib/src/main/java/io/ably/lib/realtime/Connection.java index 00aa83624..3ba28a434 100644 --- a/lib/src/main/java/io/ably/lib/realtime/Connection.java +++ b/lib/src/main/java/io/ably/lib/realtime/Connection.java @@ -1,6 +1,6 @@ package io.ably.lib.realtime; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; import io.ably.lib.realtime.ConnectionStateListener.ConnectionStateChange; import io.ably.lib.transport.ConnectionManager; import io.ably.lib.types.AblyException; @@ -123,10 +123,10 @@ public void close() { * internal *****************/ - Connection(AblyRealtime ably, ConnectionManager.Channels channels, PlatformAgentProvider platformAgentProvider, ObjectsPlugin objectsPlugin) throws AblyException { + Connection(AblyRealtime ably, ConnectionManager.Channels channels, PlatformAgentProvider platformAgentProvider, LiveObjectsPlugin liveObjectsPlugin) throws AblyException { this.ably = ably; this.state = ConnectionState.initialized; - this.connectionManager = new ConnectionManager(ably, this, channels, platformAgentProvider, objectsPlugin); + this.connectionManager = new ConnectionManager(ably, this, channels, platformAgentProvider, liveObjectsPlugin); } public void onConnectionStateChange(ConnectionStateChange stateChange) { diff --git a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java index 5e5638fb1..89107d91e 100644 --- a/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java +++ b/lib/src/main/java/io/ably/lib/transport/ConnectionManager.java @@ -14,7 +14,7 @@ import io.ably.lib.debug.DebugOptions; import io.ably.lib.debug.DebugOptions.RawProtocolListener; import io.ably.lib.http.HttpHelpers; -import io.ably.lib.objects.ObjectsPlugin; +import io.ably.lib.objects.LiveObjectsPlugin; import io.ably.lib.realtime.AblyRealtime; import io.ably.lib.realtime.Channel; import io.ably.lib.realtime.ChannelState; @@ -99,7 +99,7 @@ public class ConnectionManager implements ConnectListener { *

* This field is initialized only if the LiveObjects plugin is present in the classpath. */ - private final ObjectsPlugin objectsPlugin; + private final LiveObjectsPlugin liveObjectsPlugin; /** * Methods on the channels map owned by the {@link AblyRealtime} instance @@ -773,12 +773,12 @@ public void run() { * ConnectionManager ***********************/ - public ConnectionManager(final AblyRealtime ably, final Connection connection, final Channels channels, final PlatformAgentProvider platformAgentProvider, ObjectsPlugin objectsPlugin) throws AblyException { + public ConnectionManager(final AblyRealtime ably, final Connection connection, final Channels channels, final PlatformAgentProvider platformAgentProvider, LiveObjectsPlugin liveObjectsPlugin) throws AblyException { this.ably = ably; this.connection = connection; this.channels = channels; this.platformAgentProvider = platformAgentProvider; - this.objectsPlugin = objectsPlugin; + this.liveObjectsPlugin = liveObjectsPlugin; ClientOptions options = ably.options; this.hosts = new Hosts(options.realtimeHost, Defaults.HOST_REALTIME, options); @@ -1239,9 +1239,9 @@ public void onMessage(ITransport transport, ProtocolMessage message) throws Ably break; case object: case object_sync: - if (objectsPlugin != null) { + if (liveObjectsPlugin != null) { try { - objectsPlugin.handle(message); + liveObjectsPlugin.handle(message); } catch (Throwable t) { Log.e(TAG, "objectsPlugin threw while handling message", t); } diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultObjectsPlugin.kt b/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt similarity index 91% rename from live-objects/src/main/kotlin/io/ably/lib/objects/DefaultObjectsPlugin.kt rename to live-objects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt index 856c15a59..786eb594b 100644 --- a/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultObjectsPlugin.kt +++ b/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt @@ -4,7 +4,7 @@ import io.ably.lib.realtime.ChannelState import io.ably.lib.types.ProtocolMessage import java.util.concurrent.ConcurrentHashMap -public class DefaultObjectsPlugin(private val adapter: ObjectsAdapter) : ObjectsPlugin { +public class DefaultLiveObjectsPlugin(private val adapter: ObjectsAdapter) : LiveObjectsPlugin { private val objects = ConcurrentHashMap() From 5147cbb9920378e1e90fc621f0d5b129a72d7754 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 26 Aug 2025 14:21:08 +0100 Subject: [PATCH 2/3] chore: add liveobjects as one word, instead of live-objects --- CONTRIBUTING.md | 2 +- README.md | 2 +- examples/build.gradle.kts | 2 +- lib/src/main/java/io/ably/lib/realtime/ChannelBase.java | 2 +- {live-objects => liveobjects}/build.gradle.kts | 0 {live-objects => liveobjects}/gradle.properties | 2 +- .../main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt | 0 .../main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt | 0 .../src/main/kotlin/io/ably/lib/objects/Helpers.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectId.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectsState.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt | 0 .../src/main/kotlin/io/ably/lib/objects/ServerTime.kt | 0 .../src/main/kotlin/io/ably/lib/objects/Utils.kt | 0 .../io/ably/lib/objects/serialization/DefaultSerialization.kt | 0 .../io/ably/lib/objects/serialization/JsonSerialization.kt | 0 .../io/ably/lib/objects/serialization/MsgpackSerialization.kt | 0 .../main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt | 0 .../src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt | 0 .../io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt | 0 .../objects/type/livecounter/LiveCounterChangeCoordinator.kt | 0 .../io/ably/lib/objects/type/livecounter/LiveCounterManager.kt | 0 .../kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt | 0 .../ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt | 0 .../kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt | 0 .../kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt | 0 .../src/test/kotlin/io/ably/lib/objects/TestUtils.kt | 0 .../io/ably/lib/objects/integration/DefaultLiveCounterTest.kt | 0 .../io/ably/lib/objects/integration/DefaultLiveMapTest.kt | 0 .../ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt | 0 .../io/ably/lib/objects/integration/helpers/PayloadBuilder.kt | 0 .../io/ably/lib/objects/integration/helpers/RestObjects.kt | 0 .../kotlin/io/ably/lib/objects/integration/helpers/Utils.kt | 0 .../lib/objects/integration/helpers/fixtures/CounterFixtures.kt | 0 .../lib/objects/integration/helpers/fixtures/DataFixtures.kt | 0 .../lib/objects/integration/helpers/fixtures/MapFixtures.kt | 0 .../io/ably/lib/objects/integration/setup/IntegrationTest.kt | 0 .../kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt | 0 .../src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt | 0 .../src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt | 0 .../io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt | 0 .../kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt | 0 .../kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt | 0 .../test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt | 0 .../src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt | 0 .../src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt | 0 .../io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt | 0 .../ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt | 0 .../io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt | 0 .../kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt | 0 .../io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt | 0 .../lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt | 0 .../lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt | 0 .../io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt | 0 .../io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt | 0 settings.gradle.kts | 2 +- 60 files changed, 6 insertions(+), 6 deletions(-) rename {live-objects => liveobjects}/build.gradle.kts (100%) rename {live-objects => liveobjects}/gradle.properties (81%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/Helpers.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectId.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectsState.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/ServerTime.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/Utils.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/serialization/DefaultSerialization.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterChangeCoordinator.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt (100%) rename {live-objects => liveobjects}/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/TestUtils.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveCounterTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveMapTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/PayloadBuilder.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/RestObjects.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/Utils.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/CounterFixtures.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/DataFixtures.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/MapFixtures.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/setup/IntegrationTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt (100%) rename {live-objects => liveobjects}/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04ec04bb4..4d50b566d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ To publish the library to your local Maven repository, you can use the following Alternatively, to publish only the specific (LiveObjects) module: - ./gradlew :live-objects:publishToMavenLocal + ./gradlew :liveobjects:publishToMavenLocal - To use the locally published library in your project, you can add the following dependency in your `build.gradle` file: diff --git a/README.md b/README.md index fefa70f93..a01656621 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Add the following dependency to your `build.gradle` file: ```groovy dependencies { - runtimeOnly("io.ably:live-objects:1.2.54") + runtimeOnly("io.ably:liveobjects:1.2.54") } ``` diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 011b99e41..f9c566cf6 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -66,8 +66,8 @@ dependencies { implementation(libs.material3) implementation(libs.ktor.client.core) implementation(libs.ktor.client.cio) + implementation(project(":liveobjects")) - implementation(project(":live-objects")) implementation(project(":android")) implementation(libs.navigation.compose) diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java index 689c2b12c..b5d5c9938 100644 --- a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java +++ b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java @@ -101,7 +101,7 @@ public RealtimeObjects getObjects() throws AblyException { if (liveObjectsPlugin == null) { throw AblyException.fromErrorInfo( new ErrorInfo("LiveObjects plugin hasn't been installed, " + - "add runtimeOnly('io.ably:live-objects:') to your dependency tree", 400, 40019) + "add runtimeOnly('io.ably:liveobjects:') to your dependency tree", 400, 40019) ); } return liveObjectsPlugin.getInstance(name); diff --git a/live-objects/build.gradle.kts b/liveobjects/build.gradle.kts similarity index 100% rename from live-objects/build.gradle.kts rename to liveobjects/build.gradle.kts diff --git a/live-objects/gradle.properties b/liveobjects/gradle.properties similarity index 81% rename from live-objects/gradle.properties rename to liveobjects/gradle.properties index 29fa6bdb7..395770c76 100644 --- a/live-objects/gradle.properties +++ b/liveobjects/gradle.properties @@ -1,4 +1,4 @@ -POM_ARTIFACT_ID=live-objects +POM_ARTIFACT_ID=liveobjects POM_NAME=Live Objects plugin for Ably Pub/Sub SDK POM_DESCRIPTION=Live Objects plugin for Ably Pub/Sub SDK POM_PACKAGING=jar diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/DefaultLiveObjectsPlugin.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/DefaultRealtimeObjects.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ErrorCodes.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/Helpers.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/Helpers.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/Helpers.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/Helpers.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectId.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectId.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectId.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectId.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectMessage.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsManager.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsPool.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsState.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsState.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsState.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsState.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ObjectsSyncTracker.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/ServerTime.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/ServerTime.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/ServerTime.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/ServerTime.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/Utils.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/Utils.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/Utils.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/Utils.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/serialization/DefaultSerialization.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/DefaultSerialization.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/serialization/DefaultSerialization.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/DefaultSerialization.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/JsonSerialization.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/serialization/MsgpackSerialization.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/BaseRealtimeObject.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/ObjectLifecycle.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/DefaultLiveCounter.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterChangeCoordinator.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterChangeCoordinator.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterChangeCoordinator.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterChangeCoordinator.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livecounter/LiveCounterManager.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/DefaultLiveMap.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapChangeCoordinator.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapEntry.kt diff --git a/live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt b/liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt similarity index 100% rename from live-objects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt rename to liveobjects/src/main/kotlin/io/ably/lib/objects/type/livemap/LiveMapManager.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/TestUtils.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/TestUtils.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/TestUtils.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/TestUtils.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveCounterTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveCounterTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveCounterTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveCounterTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveMapTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveMapTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveMapTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultLiveMapTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/DefaultRealtimeObjectsTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/PayloadBuilder.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/PayloadBuilder.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/PayloadBuilder.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/PayloadBuilder.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/RestObjects.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/RestObjects.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/RestObjects.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/RestObjects.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/Utils.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/Utils.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/Utils.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/Utils.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/CounterFixtures.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/CounterFixtures.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/CounterFixtures.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/CounterFixtures.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/DataFixtures.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/DataFixtures.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/DataFixtures.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/DataFixtures.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/MapFixtures.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/MapFixtures.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/MapFixtures.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/helpers/fixtures/MapFixtures.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/setup/IntegrationTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/setup/IntegrationTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/setup/IntegrationTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/setup/IntegrationTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/integration/setup/Sandbox.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/HelpersTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectIdTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSerializationTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectMessageSizeTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/ObjectsSyncTrackerTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/RealtimeObjectsTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/TestHelpers.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/UtilsTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/fixtures/ObjectMessageFixtures.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/DefaultRealtimeObjectsTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsManagerTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/objects/ObjectsPoolTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/BaseRealtimeObjectTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/DefaultLiveCounterTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livecounter/LiveCounterManagerTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/DefaultLiveMapTest.kt diff --git a/live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt b/liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt similarity index 100% rename from live-objects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt rename to liveobjects/src/test/kotlin/io/ably/lib/objects/unit/type/livemap/LiveMapManagerTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 3460cd000..848b36749 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,5 +15,5 @@ include("network-client-core") include("network-client-default") include("network-client-okhttp") include("pubsub-adapter") -include("live-objects") +include("liveobjects") include("examples") From 0a6acd46b601fe1c0fc52f84b88a12efb63bd212 Mon Sep 17 00:00:00 2001 From: evgeny Date: Tue, 26 Aug 2025 18:21:38 +0100 Subject: [PATCH 3/3] chore: update proguard.txt to reflect LiveObjects plugin renaming --- android/proguard.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/proguard.txt b/android/proguard.txt index ac2649ebf..71c100707 100644 --- a/android/proguard.txt +++ b/android/proguard.txt @@ -1,6 +1,6 @@ -keep public class io.ably.lib.transport.WebSocketTransport$Factory {*;} -keep class io.ably.lib.types.** {*;} --keep class io.ably.lib.objects.*ObjectsPlugin {*;} +-keep class io.ably.lib.objects.*LiveObjectsPlugin {*;} -keep class io.ably.lib.objects.serialization.*Serializer {*;} -keep class io.ably.lib.objects.ObjectsJsonSerializer {*;}