From e3f834d76c7e626483e9ad498f45ceb450760f0c Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Tue, 23 Aug 2022 21:06:20 +0300 Subject: [PATCH] DROID-365 Tech | Enhancement | Integrate MW 0.22.2 (#2550) --- dependencies.gradle | 2 +- protocol/src/main/proto/commands.proto | 1 + protocol/src/main/proto/models.proto | 6 ++++++ scripts/protocol/normamize-imports.sh | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 scripts/protocol/normamize-imports.sh diff --git a/dependencies.gradle b/dependencies.gradle index abf2825d34..3e3413defb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -86,7 +86,7 @@ ext { // Anytype - middleware_version = 'v0.22.1' + middleware_version = 'v0.22.2' mainApplication = [ kotlin: "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version", diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto index 84f93f8756..2e8bf7a496 100644 --- a/protocol/src/main/proto/commands.proto +++ b/protocol/src/main/proto/commands.proto @@ -2816,6 +2816,7 @@ message Rpc { string targetId = 2; // id of the closest block repeated string blockIds = 3; // id of block for duplicate anytype.model.Block.Position position = 4; + string targetContextId = 5; } message Response { diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto index b8e3ab2623..b1df1db050 100644 --- a/protocol/src/main/proto/models.proto +++ b/protocol/src/main/proto/models.proto @@ -184,11 +184,17 @@ message Block { * Bookmark is to keep a web-link and to preview a content. */ message Bookmark { + // Deprecated. Get this data from the target object. string url = 1; + // Deprecated. Get this data from the target object. string title = 2; + // Deprecated. Get this data from the target object. string description = 3; + // Deprecated. Get this data from the target object. string imageHash = 4; + // Deprecated. Get this data from the target object. string faviconHash = 5; + LinkPreview.Type type = 6; string targetObjectId = 7; diff --git a/scripts/protocol/normamize-imports.sh b/scripts/protocol/normamize-imports.sh new file mode 100644 index 0000000000..39e8b24924 --- /dev/null +++ b/scripts/protocol/normamize-imports.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +cd .. +cd .. +cd protocol/src/main/proto/ || exit + +sed -i '' 's/pkg\/lib\/pb\/model\/protos\///g' events.proto +sed -i '' 's/pb\/protos\///g' events.proto + +sed -i '' 's/pkg\/lib\/pb\/model\/protos\///g' commands.proto +sed -i '' 's/pb\/protos\///g' commands.proto + +sed -i '' 's/pkg\/lib\/pb\/model\/protos\///g' changes.proto +sed -i '' 's/pb\/protos\///g' changes.proto + +sed -i '' 's/pkg\/lib\/pb\/model\/protos\///g' localstore.proto +sed -i '' 's/pb\/protos\///g' localstore.proto +