[flutter]: update flowy_env script

env.mk → Makefile

@@ -1,9 +1,12 @@
+.PHONY: flowy_dev install_cargo_make
 
-flowy_dev: install_rust
+flowy_dev: install_cargo_make
 	cargo make flowy_dev
 
+install_cargo_make: 
+	cargo install --force cargo-make
+
 install_rust:
-	#https://rust-lang.github.io/rustup/installation/other.html
 	sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 	curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
 	echo 'export PATH="$$HOME/.cargo/bin:$$PATH"' >> ~/.bash_profile

Makefile.toml

@@ -3,6 +3,7 @@ extend = [
     { path = "scripts/makefile/protobuf.toml" },
     { path = "scripts/makefile/tests.toml" },
     { path = "scripts/makefile/docker.toml" },
+    { path = "scripts/makefile/env.toml" },
     { path = "scripts/makefile/flutter.toml" },
 ]
 

app_flowy/pubspec.lock

@@ -366,10 +366,12 @@ packages:
   flutter_quill:
     dependency: "direct main"
     description:
-      path: "packages/flutter-quill"
-      relative: true
-    source: path
-    version: "2.0.11"
+      path: "."
+      ref: develop
+      resolved-ref: "8a4c23dcdbb8c38d49b7dea42575231877b1e56d"
+      url: "[email protected]:appflowy/flutter-quill.git"
+    source: git
+    version: "2.0.13"
   flutter_svg:
     dependency: "direct main"
     description:

app_flowy/pubspec.yaml

@@ -40,10 +40,10 @@ dependencies:
   flowy_log:
     path: packages/flowy_log
   flutter_quill:
-    path: packages/flutter-quill
-    # git:
-    #   url: [email protected]:appflowy/flutter-quill.git
-    #   ref: develop
+    # path: packages/flutter-quill
+    git:
+      url: [email protected]:appflowy/flutter-quill.git
+      ref: develop
   
   #  third party packages
   time: '>=2.0.0'

rust-lib/dart-ffi/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2018"
 [lib]
 name = "dart_ffi"
 # this value will change depending on the target os
-# for iOS it would be `rlib`
-# for Macos it would be `rlib`
+# for iOS it would be `cdylib`
+# for Macos it would be `cdylib`
 # for android it would be `c-dylib`
-# default rlib
-crate-type = ["rlib"]
+# default cdylib
+crate-type = ["cdylib"]
 
 
 [dependencies]

scripts/makefile/env.toml

@@ -18,11 +18,15 @@ rustup target add aarch64-apple-darwin
 [tasks.install_protobuf]
 script = """
 brew install [email protected]
+
+# Custom dart:
 #brew tap dart-lang/dart
 #brew install dart
+#pub global activate protoc_plugin
 
 #https://pub.dev/packages/protoc_plugin
-pub global activate protoc_plugin
+dart pub global activate protoc_plugin
+
 cargo install --version 2.20.0 protobuf-codegen
 """