Merge branch 'main' into main

skhugh · Jan 17, 2024 · b44c9ba · b44c9ba
2 parents e5decc4 + 15d0512
commit b44c9ba
Show file tree

Hide file tree

Showing 20 changed files with 1,476 additions and 848 deletions.
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
@@ -15,7 +15,7 @@ services:
     depends_on:
       - yorkie
   yorkie:
-    image: 'yorkieteam/yorkie:0.4.8'
+    image: 'yorkieteam/yorkie:0.4.10'
     container_name: 'yorkie'
     command: [
       'server',

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
   yorkie:
-    image: 'yorkieteam/yorkie:0.4.8'
+    image: 'yorkieteam/yorkie:0.4.10'
     container_name: 'yorkie'
     command: [
       'server',

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarni
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true
 GROUP=dev.yorkie
-VERSION_NAME=0.4.7
+VERSION_NAME=0.4.12
 POM_DESCRIPTION=Document store for building collaborative editing applications.
 POM_INCEPTION_YEAR=2022
 POM_URL=https://github.com/yorkie-team/yorkie-android-sdk

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-minSdk = "23"
+minSdk = "24"
 compileSdk = "34"
 targetSdk = "34"
 agp = "8.2.1"

diff --git a/yorkie/proto/src/main/proto/yorkie/v1/resources.proto b/yorkie/proto/src/main/proto/yorkie/v1/resources.proto
@@ -124,6 +124,7 @@ message Operation {
     TreePos to = 3;
     map<string, TimeTicket> created_at_map_by_actor = 4;
     repeated TreeNodes contents = 5;
+    int32 split_level = 7;
     TimeTicket executed_at = 6;
   }
   message TreeStyle {
@@ -358,9 +359,16 @@ enum DocEventType {
   DOC_EVENT_TYPE_DOCUMENT_CHANGED = 0;
   DOC_EVENT_TYPE_DOCUMENT_WATCHED = 1;
   DOC_EVENT_TYPE_DOCUMENT_UNWATCHED = 2;
+  DOC_EVENT_TYPE_DOCUMENT_BROADCAST = 3;
+}
+
+message DocEventBody {
+  string topic = 1;
+  bytes payload = 2;
 }
 
 message DocEvent {
   DocEventType type = 1;
   string publisher = 2;
+  DocEventBody body = 3;
 }
diff --git a/yorkie/proto/src/main/proto/yorkie/v1/yorkie.proto b/yorkie/proto/src/main/proto/yorkie/v1/yorkie.proto
@@ -35,6 +35,8 @@ service YorkieService {
   rpc PushPullChanges (PushPullChangesRequest) returns (PushPullChangesResponse) {}
 
   rpc WatchDocument (WatchDocumentRequest) returns (stream WatchDocumentResponse) {}
+
+  rpc Broadcast (BroadcastRequest) returns (BroadcastResponse) {}
 }
 
 message ActivateClientRequest {
@@ -109,3 +111,14 @@ message PushPullChangesRequest {
 message PushPullChangesResponse {
   ChangePack change_pack = 1;
 }
+
+message BroadcastRequest {
+  string client_id = 1;
+  string document_id = 2;
+  string topic = 3;
+  bytes payload = 4;
+}
+
+message BroadcastResponse {
+}
+