Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump protobuf version (#4123)

Browse Source 
makes it compatible with protoc_plugin 21.x.x
This commit is contained in:
Richard Shiue 2023-12-10 21:26:53 +08:00 committed by GitHub
parent 775955df5c
commit eff06a1f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/appflowy_flutter/packages/appflowy_backend/pubspec.yaml
View File

@ -13,7 +13,7 @@ dependencies:
sdk: flutter sdk: flutter
ffi: ^2.0.2 ffi: ^2.0.2
isolates: ^3.0.3+8 isolates: ^3.0.3+8
protobuf: ^2.0.0 protobuf: ^3.1.0
dartz: ^0.10.1 dartz: ^0.10.1
freezed_annotation: freezed_annotation:
logger: ^1.0.0 logger: ^1.0.0

4
frontend/appflowy_flutter/pubspec.lock
View File

@ -1318,10 +1318,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: protobuf name: protobuf
sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "3.1.0"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:

2
frontend/appflowy_flutter/pubspec.yaml
View File

@ -83,7 +83,7 @@ dependencies:
hotkey_manager: ^0.1.7 hotkey_manager: ^0.1.7
fixnum: ^1.1.0 fixnum: ^1.1.0
flutter_svg: ^2.0.7 flutter_svg: ^2.0.7
protobuf: ^2.1.0 protobuf: ^3.1.0
charcode: ^1.3.1 charcode: ^1.3.1
collection: ^1.17.1 collection: ^1.17.1
bloc: ^8.1.2 bloc: ^8.1.2

2
frontend/scripts/docker-buildfiles/Dockerfile
View File

@ -44,7 +44,7 @@ RUN curl -sSfL \
rm flutter.tar.xz rm flutter.tar.xz
RUN flutter config --enable-linux-desktop RUN flutter config --enable-linux-desktop
RUN flutter doctor RUN flutter doctor
RUN dart pub global activate protoc_plugin 20.0.1 RUN dart pub global activate protoc_plugin 21.1.2
# Install build dependencies for AppFlowy # Install build dependencies for AppFlowy
RUN yay -S --noconfirm jemalloc4 cargo-make cargo-binstall RUN yay -S --noconfirm jemalloc4 cargo-make cargo-binstall

17
frontend/scripts/makefile/protobuf.toml
View File

@ -23,8 +23,7 @@ windows_alias = "install-protobuf-windows"
linux_alias = "install-protobuf" linux_alias = "install-protobuf"
[tasks.install-protobuf] [tasks.install-protobuf]
condition_script = [ condition_script = ["""
"""
if ! command -v protoc-gen-dart if ! command -v protoc-gen-dart
then then
exit 0 exit 0
@ -32,8 +31,7 @@ condition_script = [
# installed # installed
exit 1 exit 1
""", """]
]
run_task = { name = ["install_flutter_protobuf_compiler"] } run_task = { name = ["install_flutter_protobuf_compiler"] }
[tasks.install-protobuf-windows] [tasks.install-protobuf-windows]
@ -45,7 +43,7 @@ if is_empty ${ret}
end end
ret = which protoc-gen-dart ret = which protoc-gen-dart
if is_empty ${ret} if is_empty ${ret}
exec cmd.exe /c dart pub global activate protoc_plugin 20.0.1 exec cmd.exe /c dart pub global activate protoc_plugin 21.1.2
end end
ret = which protoc-gen-dart ret = which protoc-gen-dart
if is_empty ${ret} if is_empty ${ret}
@ -60,18 +58,13 @@ script_runner = "@duckscript"
[tasks.install_flutter_protobuf_compiler] [tasks.install_flutter_protobuf_compiler]
script = """ script = """
echo "Install protoc_plugin (Dart)" echo "Install protoc_plugin (Dart)"
dart pub global activate protoc_plugin 20.0.1 dart pub global activate protoc_plugin 21.1.2
""" """
script_runner = "@shell" script_runner = "@shell"
[tasks.install_flutter_protobuf_compiler.linux] [tasks.install_flutter_protobuf_compiler.linux]
script = """ script = """
echo "Install protoc_plugin (Dart)" echo "Install protoc_plugin (Dart)"
dart pub global activate protoc_plugin 20.0.1 dart pub global activate protoc_plugin 21.1.2
""" """
script_runner = "@shell" script_runner = "@shell"