From 6a2a9a9f5fb7d95b9c623c5721529075626d861c Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 6 Aug 2024 16:23:19 +0700 Subject: [PATCH] Standardize branch names of dependencies --- contact/pubspec.lock | 6 +++--- contact/pubspec.yaml | 2 +- email_recovery/pubspec.lock | 6 +++--- email_recovery/pubspec.yaml | 2 +- fcm/pubspec.lock | 6 +++--- fcm/pubspec.yaml | 2 +- forward/pubspec.lock | 6 +++--- forward/pubspec.yaml | 2 +- model/pubspec.lock | 6 +++--- model/pubspec.yaml | 2 +- pubspec.lock | 36 ++++++++++++++++++------------------ pubspec.yaml | 11 +++++------ rule_filter/pubspec.lock | 6 +++--- rule_filter/pubspec.yaml | 2 +- server_settings/pubspec.yaml | 2 +- 15 files changed, 48 insertions(+), 49 deletions(-) diff --git a/contact/pubspec.lock b/contact/pubspec.lock index e16cc2237..3ef7ca5d8 100644 --- a/contact/pubspec.lock +++ b/contact/pubspec.lock @@ -611,11 +611,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/contact/pubspec.yaml b/contact/pubspec.yaml index d75114a24..8e3f4c7fe 100644 --- a/contact/pubspec.yaml +++ b/contact/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5 diff --git a/email_recovery/pubspec.lock b/email_recovery/pubspec.lock index 758582ce5..61717b321 100644 --- a/email_recovery/pubspec.lock +++ b/email_recovery/pubspec.lock @@ -295,11 +295,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/email_recovery/pubspec.yaml b/email_recovery/pubspec.yaml index c34995a5e..15b800ecf 100644 --- a/email_recovery/pubspec.yaml +++ b/email_recovery/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5 diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock index a3355d3a0..e9ed8ece9 100644 --- a/fcm/pubspec.lock +++ b/fcm/pubspec.lock @@ -295,11 +295,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml index 3bcc6bd88..c4193e380 100644 --- a/fcm/pubspec.yaml +++ b/fcm/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5 diff --git a/forward/pubspec.lock b/forward/pubspec.lock index a3355d3a0..e9ed8ece9 100644 --- a/forward/pubspec.lock +++ b/forward/pubspec.lock @@ -295,11 +295,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/forward/pubspec.yaml b/forward/pubspec.yaml index d0c221e3a..4e33bec0a 100644 --- a/forward/pubspec.yaml +++ b/forward/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5 diff --git a/model/pubspec.lock b/model/pubspec.lock index 428bc03ba..24c5b4026 100644 --- a/model/pubspec.lock +++ b/model/pubspec.lock @@ -603,11 +603,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/model/pubspec.yaml b/model/pubspec.yaml index 19ec9737e..e6fbce62b 100644 --- a/model/pubspec.yaml +++ b/model/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### cupertino_icons: 1.0.6 diff --git a/pubspec.lock b/pubspec.lock index f38644f00..336824d9b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -436,11 +436,11 @@ packages: dependency: transitive description: path: "." - ref: cnb_supported - resolved-ref: "8301d67b4c30bb2234bbe96de4ae135b88a6af40" + ref: master + resolved-ref: "55817316c081a363a410fd0c14867be28096790d" url: "https://github.com/linagora/enough_html_editor.git" source: git - version: "0.0.5" + version: "0.1.0" enough_platform_widgets: dependency: transitive description: @@ -667,11 +667,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint_25_flutter_3_22_2 - resolved-ref: "8e1e6e0e18ef6e1baae719c42b1483237ba5c56b" + ref: main + resolved-ref: "66e3713f0e7a22da911b360cef4d219fc30cee77" url: "https://github.com/linagora/flutter-date-range-picker.git" source: git - version: "1.0.2" + version: "2.0.0" flutter_dotenv: dependency: "direct main" description: @@ -1106,11 +1106,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint_25_flutter_3_22_2 - resolved-ref: "0020802d02f69fc02bc56cf18d6962d10babe097" + ref: main + resolved-ref: "3cf2553565cc485d4405301a9e1f8af2d676afb2" url: "https://github.com/linagora/html-editor-enhanced.git" source: git - version: "2.5.1" + version: "3.1.0" http: dependency: transitive description: @@ -1195,11 +1195,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: @@ -1451,11 +1451,11 @@ packages: dependency: "direct main" description: path: "." - ref: twake_supported - resolved-ref: f094c42517cb760a2e8457f63823b138f42b0efa + ref: main + resolved-ref: "5ee423463cbeee302400d5e7fdae1a83c7fe1720" url: "https://github.com/linagora/flutter_pdf_render.git" source: git - version: "1.4.8" + version: "2.0.0" pdf_widget_wrapper: dependency: transitive description: @@ -1645,11 +1645,11 @@ packages: dependency: "direct main" description: path: "." - ref: cnb_supported - resolved-ref: "955d70b3e57ddeed2b709ee8822c7a8a620e1aaa" + ref: main + resolved-ref: "4a4ee913fbdec0f98cc1755f31df54fb402d0957" url: "https://github.com/linagora/rich-text-composer.git" source: git - version: "0.0.2" + version: "0.1.0" rule_filter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 9fcaff4fa..f79b417ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -55,12 +55,12 @@ dependencies: rich_text_composer: git: url: https://github.com/linagora/rich-text-composer.git - ref: cnb_supported + ref: main html_editor_enhanced: git: url: https://github.com/linagora/html-editor-enhanced.git - ref: sprint_25_flutter_3_22_2 + ref: main # TODO: Move back to master after sprint 25 released # TODO: We will change it when the PR in upstream repository will be merged @@ -68,7 +68,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main contacts_service: git: @@ -88,7 +88,7 @@ dependencies: flutter_date_range_picker: git: url: https://github.com/linagora/flutter-date-range-picker.git - ref: sprint_25_flutter_3_22_2 + ref: main # TODO: Move back to master after sprint 25 released super_tag_editor: 0.3.0 @@ -102,11 +102,10 @@ dependencies: # TODO: We will change it when the PR in upstream repository will be merged # https://github.com/espresso3389/flutter_pdf_render/pull/148 - # https://github.com/espresso3389/flutter_pdf_render/pull/151 pdf_render: git: url: https://github.com/linagora/flutter_pdf_render.git - ref: twake_supported + ref: main ### Dependencies from pub.dev ### cupertino_icons: 1.0.6 diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock index a3355d3a0..e9ed8ece9 100644 --- a/rule_filter/pubspec.lock +++ b/rule_filter/pubspec.lock @@ -295,11 +295,11 @@ packages: dependency: "direct main" description: path: "." - ref: sprint25_from_migrate_5jun - resolved-ref: "4783ba7b56eb4dda591538d9c486375162a9da79" + ref: main + resolved-ref: d111cd2feaafc0cc653eedbc7dd60deab8ead344 url: "https://github.com/linagora/jmap-dart-client.git" source: git - version: "0.0.1" + version: "0.1.0" js: dependency: transitive description: diff --git a/rule_filter/pubspec.yaml b/rule_filter/pubspec.yaml index a06a32eae..5cf079523 100644 --- a/rule_filter/pubspec.yaml +++ b/rule_filter/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5 diff --git a/server_settings/pubspec.yaml b/server_settings/pubspec.yaml index b0ee4551a..6a0e03fc0 100644 --- a/server_settings/pubspec.yaml +++ b/server_settings/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: jmap_dart_client: git: url: https://github.com/linagora/jmap-dart-client.git - ref: sprint25_from_migrate_5jun + ref: main ### Dependencies from pub.dev ### equatable: 2.0.5