From 9c9ee9654476fcc54ad7542ba0f5f38dfd28dbc7 Mon Sep 17 00:00:00 2001 From: ujwalbasnet1 Date: Sat, 15 Oct 2022 10:08:51 +0545 Subject: [PATCH 1/4] chore: notus packages updated --- packages/notus/pubspec.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/notus/pubspec.yaml b/packages/notus/pubspec.yaml index 334a25911..c79450bcf 100644 --- a/packages/notus/pubspec.yaml +++ b/packages/notus/pubspec.yaml @@ -4,14 +4,14 @@ version: 1.0.0-rc.2 homepage: https://github.com/memspace/zefyr environment: - sdk: '>=2.12.0 <3.0.0' + sdk: ">=2.18.0 <4.0.0" dependencies: - collection: ^1.15.0 - coverage: ^1.0.3 - quill_delta: ^3.0.0-nullsafety.1 - quiver: ^3.0.1 + collection: 1.16.0 + coverage: 1.5.0 + quill_delta: ^3.0.0-nullsafety.2 + quiver: ^3.1.0 dev_dependencies: - test: ^1.10.0 - lints: ^1.0.1 + test: ^1.21.6 + lints: ^2.0.0 From 984410bbc00a51c3ba3a2308bcc78645dff24e0a Mon Sep 17 00:00:00 2001 From: ujwalbasnet1 Date: Sat, 15 Oct 2022 10:11:59 +0545 Subject: [PATCH 2/4] chore: zefyr packages updated --- packages/zefyr/pubspec.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/zefyr/pubspec.yaml b/packages/zefyr/pubspec.yaml index 992d32f94..bd9a5a0bf 100644 --- a/packages/zefyr/pubspec.yaml +++ b/packages/zefyr/pubspec.yaml @@ -2,20 +2,26 @@ name: zefyr description: Clean, minimalistic and collaboration-ready rich text editor for Flutter. version: 1.0.0-rc.5 homepage: https://github.com/memspace/zefyr +publish_to: none environment: - sdk: '>=2.15.0 <3.0.0' + sdk: ">=2.18.0 <4.0.0" dependencies: flutter: sdk: flutter - collection: ^1.14.6 - url_launcher: ^6.0.9 - quill_delta: ^3.0.0-nullsafety.1 - notus: ^1.0.0-rc.2 - characters: ^1.0.0 + collection: 1.16.0 + url_launcher: ^6.1.6 + quill_delta: ^3.0.0-nullsafety.2 + + notus: + git: + url: https://github.com/ujwalbasnet1/zefyr + path: packages/notus + + characters: ^1.2.1 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.4 + flutter_lints: ^2.0.1 From 6f9281913c8f8699444a745cf8ada92a87c6a908 Mon Sep 17 00:00:00 2001 From: ujwalbasnet1 Date: Sun, 16 Oct 2022 12:21:41 +0545 Subject: [PATCH 3/4] fix: null safety --- packages/notus/lib/src/heuristics/insert_rules.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/notus/lib/src/heuristics/insert_rules.dart b/packages/notus/lib/src/heuristics/insert_rules.dart index 2eb358aae..0b92ad102 100644 --- a/packages/notus/lib/src/heuristics/insert_rules.dart +++ b/packages/notus/lib/src/heuristics/insert_rules.dart @@ -260,7 +260,7 @@ class PreserveInlineStylesRule extends InsertRule { return noLinkResult; } // We must make sure links are identical in previous and next operations. - if (attributes![NotusAttribute.link.key] == + if (attributes[NotusAttribute.link.key] == nextAttributes[NotusAttribute.link.key]) { return Delta() ..retain(index) From 539e929533b11d9c090159929b3e24e2460607ee Mon Sep 17 00:00:00 2001 From: ujwalbasnet1 Date: Sun, 16 Oct 2022 12:22:33 +0545 Subject: [PATCH 4/4] fix: use notus from memspace --- packages/zefyr/pubspec.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/zefyr/pubspec.yaml b/packages/zefyr/pubspec.yaml index bd9a5a0bf..e48c1aab3 100644 --- a/packages/zefyr/pubspec.yaml +++ b/packages/zefyr/pubspec.yaml @@ -16,8 +16,9 @@ dependencies: notus: git: - url: https://github.com/ujwalbasnet1/zefyr + url: https://github.com/memspace/zefyr path: packages/notus + ref: 6f9281913c8f8699444a745cf8ada92a87c6a908 characters: ^1.2.1