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.

Sign up for GitHub

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

Reflecting Changes in Tree from 0.4.8 to 0.4.12 #147

Merged
merged 11 commits into from
Jan 17, 2024
Merged

Reflecting Changes in Tree from 0.4.8 to 0.4.12 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
56a5277
update min sdk to 24
7hong13 Jan 16, 2024
d81336b
improve tree logic
7hong13 Jan 16, 2024
5c919c5
removed functions that are not used anymore
7hong13 Jan 16, 2024
5ef871a
Merge branch 'main' of https://github.com/yorkie-team/yorkie-android-…
7hong13 Jan 16, 2024
3e1216d
fix format
7hong13 Jan 16, 2024
3f7b0c7
downgrade server version
7hong13 Jan 16, 2024
13b3308
simplify the code using orEmpty()
7hong13 Jan 16, 2024
b5998fd
remove editT
7hong13 Jan 16, 2024
8454812
update proto models
7hong13 Jan 16, 2024
df35783
update version to 0.4.12
7hong13 Jan 16, 2024
0b21905
add more tests on tree
7hong13 Jan 17, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
strategy:
fail-fast: false
matrix:
api-level: [ 23 ]
api-level: [ 24 ]
target: [ google_apis ]
runs-on: macos-latest
timeout-minutes: 60
Expand Down Expand Up @@ -98,9 +98,9 @@ jobs:
script: |
./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest --no-build-cache --no-daemon --stacktrace
./gradlew yorkie:connectedCheck -Pandroid.testInstrumentationRunnerArguments.annotation=androidx.test.filters.LargeTest --no-build-cache --no-daemon --stacktrace
- if: ${{ matrix.api-level == 23 }}
- if: ${{ matrix.api-level == 24 }}
run: ./gradlew yorkie:jacocoDebugTestReport
- if: ${{ matrix.api-level == 23 }}
- if: ${{ matrix.api-level == 24 }}
uses: actions/upload-artifact@v3
with:
name: android-test-artifact
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hackerwins activateClientRequest returns the following error for the server version 0.4.11 and above:

io.grpc.StatusException: UNAVAILABLE: upstream connect error or disconnect/reset before headers. reset reason: connection termination

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the protobuf models to the latest version(8454812), but the issue still persists.
It's working fine with the real server(api.yorkie.dev, 443), so I'll keep the CI local server version at 0.4.10 until the issue is resolved

container_name: 'yorkie'
command: [
'server',
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[versions]
minSdk = "23"
minSdk = "24"
compileSdk = "34"
targetSdk = "34"
agp = "8.2.1"
Expand Down
8 changes: 8 additions & 0 deletions yorkie/proto/src/main/proto/yorkie/v1/resources.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
13 changes: 13 additions & 0 deletions yorkie/proto/src/main/proto/yorkie/v1/yorkie.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ service YorkieService {
rpc PushPullChanges (PushPullChangesRequest) returns (PushPullChangesResponse) {}

rpc WatchDocument (WatchDocumentRequest) returns (stream WatchDocumentResponse) {}

rpc Broadcast (BroadcastRequest) returns (BroadcastResponse) {}
}

message ActivateClientRequest {
Expand Down Expand Up @@ -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 {
}

Loading
Loading