Merge pull request #2392 from nextcloud/chore/deps/flutter-3.22.0

nextcloud · Aug 16, 2024 · 1fd27d0 · 1fd27d0
2 parents c49d830 + 955f599
commit 1fd27d0
Show file tree

Hide file tree

Showing 120 changed files with 113 additions and 120 deletions.
diff --git a/.fvmrc b/.fvmrc
@@ -1,4 +1,4 @@
 {
-  "flutter": "3.24.0",
+  "flutter": "3.22.3",
   "updateVscodeSettings": false
 }
diff --git a/.github/workflows/conventional_commits.yaml b/.github/workflows/conventional_commits.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Install commitlint_cli
         run: dart pub get
 

diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Setup
         run: ./tool/setup.sh
 

diff --git a/.github/workflows/generate.yaml b/.github/workflows/generate.yaml
@@ -40,7 +40,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Setup
         run: ./tool/setup.sh
 

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Setup
         run: ./tool/setup.sh
 
@@ -104,7 +104,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Setup
         run: ./tool/setup.sh
       - name: Build

diff --git a/.github/workflows/update_presets.yaml b/.github/workflows/update_presets.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Install dart
         uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 # v1
         with:
-          sdk: 3.5
+          sdk: 3.4
       - name: Setup
         run: ./tool/setup.sh
 

diff --git a/melos.yaml b/melos.yaml
@@ -35,8 +35,8 @@ scripts:
   format: dart format --fix --line-length 120 .
   format:check: dart format --output=none --set-exit-if-changed --line-length 120 .
   analyze: >
-    dart analyze --fatal-infos . #&&
-    #dart run custom_lint --fatal-infos .
+    dart analyze --fatal-infos . &&
+    dart run custom_lint --fatal-infos .
   test: >
     melos run test:dart &&
     melos run test:flutter

diff --git a/packages/dynamite/example/pubspec.yaml b/packages/dynamite/example/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   uri: ^1.0.0
 
 dev_dependencies:
-  build_runner: ^2.4.12
+  build_runner: ^2.4.11
   built_value_generator: ^8.9.2
   dynamite: ^0.5.0
   neon_lints:

diff --git a/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml b/packages/dynamite/packages/dynamite_end_to_end_test/pubspec.yaml
@@ -16,7 +16,7 @@ dependencies:
   uri: ^1.0.0
 
 dev_dependencies:
-  build_runner: ^2.4.12
+  build_runner: ^2.4.11
   built_value_generator: ^8.9.2
   built_value_test: ^8.9.2
   dynamite: ^0.5.0

diff --git a/packages/dynamite/packages/dynamite_runtime/pubspec.yaml b/packages/dynamite/packages/dynamite_runtime/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
   xml: ^6.0.0
 
 dev_dependencies:
-  build_runner: ^2.4.12
+  build_runner: ^2.4.11
   built_value_generator: ^8.9.2
   neon_lints:
     git:

diff --git a/packages/dynamite/pubspec.yaml b/packages/dynamite/pubspec.yaml
@@ -31,7 +31,7 @@ dependencies:
   version: ^3.0.0
 
 dev_dependencies:
-  build_runner: ^2.4.12
+  build_runner: ^2.4.11
   built_value_generator: ^8.9.2
   built_value_test: ^8.9.2
   neon_lints:

diff --git a/packages/neon_framework/example/pubspec.lock b/packages/neon_framework/example/pubspec.lock
@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.4.1"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -158,6 +153,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
+  ci:
+    dependency: transitive
+    description:
+      name: ci
+      sha256: "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -237,6 +248,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  custom_lint:
+    dependency: "direct dev"
+    description:
+      name: custom_lint
+      sha256: "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.4"
+  custom_lint_builder:
+    dependency: transitive
+    description:
+      name: custom_lint_builder
+      sha256: d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.4"
+  custom_lint_core:
+    dependency: transitive
+    description:
+      name: custom_lint_core
+      sha256: a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.3"
   dart_style:
     dependency: transitive
     description:
@@ -557,6 +592,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.7.0"
+  freezed_annotation:
+    dependency: transitive
+    description:
+      name: freezed_annotation
+      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.4"
   glob:
     dependency: transitive
     description:
@@ -573,6 +616,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.3"
+  hotreloader:
+    dependency: transitive
+    description:
+      name: hotreloader
+      sha256: ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
   html:
     dependency: transitive
     description:
@@ -713,18 +764,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -749,14 +800,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
   markdown:
     dependency: transitive
     description:
@@ -777,18 +820,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -1154,10 +1197,10 @@ packages:
     dependency: transitive
     description:
       name: rxdart
-      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.28.0"
+    version: "0.27.7"
   screen_retriever:
     dependency: transitive
     description:
@@ -1373,10 +1416,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.0"
   timezone:
     dependency: transitive
     description:
@@ -1549,10 +1592,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.1"
   wakelock_plus:
     dependency: transitive
     description:

diff --git a/packages/neon_framework/example/pubspec.yaml b/packages/neon_framework/example/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
   vector_graphics: any
 
 dev_dependencies:
-  #custom_lint: ^0.6.4
+  custom_lint: ^0.6.4
   neon_lints:
     git:
       url: https://github.com/nextcloud/neon

diff --git a/packages/neon_framework/lib/l10n/localizations.dart b/packages/neon_framework/lib/l10n/localizations.dart
@@ -7,8 +7,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
-// ignore_for_file: type=lint
-
 /// Callers can lookup localized strings with an instance of NeonLocalizations
 /// returned by `NeonLocalizations.of(context)`.
 ///

diff --git a/packages/neon_framework/lib/l10n/localizations_en.dart b/packages/neon_framework/lib/l10n/localizations_en.dart
@@ -2,8 +2,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations.dart';
 
-// ignore_for_file: type=lint
-
 /// The translations for English (`en`).
 class NeonLocalizationsEn extends NeonLocalizations {
   NeonLocalizationsEn([String locale = 'en']) : super(locale);

diff --git a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations.dart
@@ -7,8 +7,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
-// ignore_for_file: type=lint
-
 /// Callers can lookup localized strings with an instance of DashboardLocalizations
 /// returned by `DashboardLocalizations.of(context)`.
 ///

diff --git a/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/dashboard_app/lib/l10n/localizations_en.dart
@@ -2,8 +2,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations.dart';
 
-// ignore_for_file: type=lint
-
 /// The translations for English (`en`).
 class DashboardLocalizationsEn extends DashboardLocalizations {
   DashboardLocalizationsEn([String locale = 'en']) : super(locale);

diff --git a/packages/neon_framework/packages/dashboard_app/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml
@@ -21,11 +21,11 @@ dependencies:
       url: https://github.com/nextcloud/neon
       path: packages/neon_framework
   nextcloud: ^7.0.0
-  rxdart: ^0.28.0
+  rxdart: ^0.27.0
 
 dev_dependencies:
-  build_runner: ^2.4.12
-  #custom_lint: ^0.6.4
+  build_runner: ^2.4.11
+  custom_lint: ^0.6.4
   flutter_test:
     sdk: flutter
   go_router_builder: ^2.7.1

diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget.png
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_more.png
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_button_new.png
diff --git a/...ages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png b/...ages/neon_framework/packages/dashboard_app/test/goldens/widget_button_setup.png
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_item.png
diff --git a/...es/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png b/...es/neon_framework/packages/dashboard_app/test/goldens/widget_item_not_round.png
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_not_round.png
diff --git a/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png b/packages/neon_framework/packages/dashboard_app/test/goldens/widget_with_empty.png
diff --git a/...mework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png b/...mework/packages/dashboard_app/test/goldens/widget_with_empty_and_half_empty.png
diff --git a/...s/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png b/...s/neon_framework/packages/dashboard_app/test/goldens/widget_with_half_empty.png
diff --git a/..._framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png b/..._framework/packages/dashboard_app/test/goldens/widget_with_multiple_buttons.png
diff --git a/...s/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png b/...s/neon_framework/packages/dashboard_app/test/goldens/widget_without_buttons.png
diff --git a/...ges/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png b/...ges/neon_framework/packages/dashboard_app/test/goldens/widget_without_items.png
diff --git a/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations.dart
@@ -7,8 +7,6 @@ import 'package:intl/intl.dart' as intl;
 
 import 'localizations_en.dart';
 
-// ignore_for_file: type=lint
-
 /// Callers can lookup localized strings with an instance of FilesLocalizations
 /// returned by `FilesLocalizations.of(context)`.
 ///

diff --git a/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart b/packages/neon_framework/packages/files_app/lib/l10n/localizations_en.dart
@@ -1,7 +1,5 @@
 import 'localizations.dart';
 
-// ignore_for_file: type=lint
-
 /// The translations for English (`en`).
 class FilesLocalizationsEn extends FilesLocalizations {
   FilesLocalizationsEn([String locale = 'en']) : super(locale);