chore!: upgrade flutter to 3.24.1 and dart to 3.5.0 (#725)

* chore: upgrade flutter to 3.24.1, dart to 3.5.0 * chore: update catalyst_analysis dependency to be always overridden by melos, fix lint issues * chore: format code * chore: update flutter ci * chore: upgrade flutter to 3.24.1, dart to 3.5.0 - fix Menu issue * chore: upgrade build runner * chore: disabled linter rule that crashes * chore: upgrade deprecated swift annotations * chore: update Podfile.lock * chore: upgrade sentry * chore: update sentry * chore: make sure the project uses a stable win32 version * chore: upgrade flutter ci * chore: downgrade cat-ci except for flutter-ci * chore: restore docs ci version --------- Co-authored-by: digitalheartxs <[email protected]>
input-output-hk · Aug 29, 2024 · eb8a516 · eb8a516
1 parent 00dd389
commit eb8a516
Show file tree

Hide file tree

Showing 76 changed files with 422 additions and 407 deletions.
diff --git a/.config/dictionaries/project.dic b/.config/dictionaries/project.dic
@@ -247,3 +247,5 @@ unchunk
 EUTXO
 eddsa
 toggleable
+interps
+todos
diff --git a/.github/workflows/flutter-publish-packages.yml b/.github/workflows/flutter-publish-packages.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.22.1
+          flutter-version: 3.24.1
       - uses: bluefireteam/melos-action@v3
         with:
           run-versioning: true

diff --git a/catalyst_voices/Earthfile b/catalyst_voices/Earthfile
@@ -1,7 +1,7 @@
 VERSION 0.8
 
 IMPORT ../catalyst-gateway AS catalyst-gateway
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.1.21 AS flutter-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/flutter:v3.1.25 AS flutter-ci
 
 # Copy all the necessary files and running bootstrap
 builder:

diff --git a/catalyst_voices/README.md b/catalyst_voices/README.md
@@ -16,8 +16,8 @@ This repository contains the Catalyst Voices app and packages.
 
 ## Requirements
 
-* flutter: 3.22.1+
-* Dart: 3.3.4+
+* flutter: 3.24.1+
+* Dart: 3.5.0+
 * Ruby: 2.5+
 * Xcode: 15.0+
 * Android Studio: Android Studio Electric Eel | 2022.1.1 +

diff --git a/catalyst_voices/analysis_options.yaml b/catalyst_voices/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:catalyst_analysis/analysis_options.1.0.0.yaml
+include: package:catalyst_analysis/analysis_options.yaml
 
 analyzer:
   exclude: [

diff --git a/catalyst_voices/ios/Podfile.lock b/catalyst_voices/ios/Podfile.lock
@@ -4,37 +4,57 @@ PODS:
     - Flutter
   - integration_test (0.0.1):
     - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - Sentry/HybridSDK (8.35.1)
+  - sentry_flutter (8.8.0):
+    - Flutter
+    - FlutterMacOS
+    - Sentry/HybridSDK (= 8.35.1)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
+SPEC REPOS:
+  trunk:
+    - Sentry
+
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  sentry_flutter:
+    :path: ".symlinks/plugins/sentry_flutter/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
-  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
+  sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: ff9ae414ffbc80ad6f9d2058e299051a15f6eca7
 

diff --git a/catalyst_voices/ios/Runner/AppDelegate.swift b/catalyst_voices/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/catalyst_voices/lib/widgets/app_bar/actions/user_profile_button.dart b/catalyst_voices/lib/widgets/app_bar/actions/user_profile_button.dart
@@ -22,8 +22,8 @@ class UserProfileButton extends StatelessWidget {
     } else {
       return Chip(
         shape: const RoundedRectangleBorder(
-        // This is a custom chip that simulates a button look&feel, so visual 
-        // property are specified.
+          // This is a custom chip that simulates a button look&feel, so visual
+          // property are specified.
           borderRadius: BorderRadius.all(Radius.circular(30)),
         ),
         label: Text(context.l10n.userProfileGuestLabelText),

diff --git a/catalyst_voices/lib/widgets/avatars/voices_avatar.dart b/catalyst_voices/lib/widgets/avatars/voices_avatar.dart
@@ -52,8 +52,8 @@ class VoicesAvatar extends StatelessWidget {
               child: IconTheme(
                 data: IconTheme.of(context).copyWith(
                   size: 24,
-                  color: foregroundColor ??
-                      Theme.of(context).colorScheme.primary,
+                  color:
+                      foregroundColor ?? Theme.of(context).colorScheme.primary,
                 ),
                 child: DefaultTextStyle(
                   style: Theme.of(context).textTheme.bodyLarge!.copyWith(

diff --git a/catalyst_voices/lib/widgets/menu/voices_menu.dart b/catalyst_voices/lib/widgets/menu/voices_menu.dart
@@ -74,7 +74,7 @@ class _MenuButton extends StatelessWidget {
     );
 
     final children = menuChildren;
-    return Wrap(
+    return Column(
       children: [
         Stack(
           children: [

diff --git a/catalyst_voices/macos/Podfile.lock b/catalyst_voices/macos/Podfile.lock
@@ -7,11 +7,11 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - Sentry/HybridSDK (8.29.0)
-  - sentry_flutter (8.3.0):
+  - Sentry/HybridSDK (8.35.1)
+  - sentry_flutter (8.8.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.29.0)
+    - Sentry/HybridSDK (= 8.35.1)
   - url_launcher_macos (0.0.1):
     - FlutterMacOS
 
@@ -46,8 +46,8 @@ SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  Sentry: 016de45ee5ce5fca2a829996f1bfafeb5e62e8b4
-  sentry_flutter: 5fb57c5b7e6427a9dc1fedde4269eb65823982d4
+  Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
+  sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
   url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
 
 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367

diff --git a/catalyst_voices/macos/Runner/AppDelegate.swift b/catalyst_voices/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true

diff --git a/catalyst_voices/packages/catalyst_voices_assets/analysis_options.yaml b/catalyst_voices/packages/catalyst_voices_assets/analysis_options.yaml
@@ -0,0 +1,14 @@
+include: package:catalyst_analysis/analysis_options.yaml
+
+analyzer:
+  exclude:
+    [
+      build/**,
+      lib/*.g.dart,
+      lib/generated/**,
+      lib/src/catalyst_voices_icons.dart,
+    ]
+
+linter:
+  rules:
+    public_member_api_docs: false
diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/lib/src/main.dart b/catalyst_voices/packages/catalyst_voices_assets/example/lib/src/main.dart
@@ -1,7 +1,7 @@
 import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:flutter/material.dart';
 
-void main() => runApp(Example());
+void main() => runApp(const Example());
 
 final class Example extends StatelessWidget {
   const Example({super.key});

diff --git a/catalyst_voices/packages/catalyst_voices_assets/example/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_assets/example/pubspec.yaml
@@ -4,8 +4,8 @@ version: 0.1.0+1
 publish_to: none
 
 environment:
-  sdk: ">=3.3.4 <4.0.0"
-  flutter: ">=3.22.1"
+  sdk: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.1"
 
 dependencies:
   catalyst_voices_assets:

diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/src/assets_ext.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/src/assets_ext.dart
@@ -41,7 +41,7 @@ extension SvgGenImageExt on SvgGenImage {
     );
   }
 
-  /// See [CatalystVoicesIcon]. See class for more context.
+  /// See [CatalystSvgIcon]. See class for more context.
   Widget buildIcon({
     Key? key,
     AssetBundle? bundle,

diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_image.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_image.dart
@@ -7,52 +7,29 @@ import 'package:flutter/widgets.dart';
 /// For more information, see [Image.asset].
 final class CatalystImage extends Image {
   CatalystImage.asset(
-    String name, {
-    AssetBundle? bundle,
-    ImageFrameBuilder? frameBuilder,
-    ImageErrorWidgetBuilder? errorBuilder,
-    String? semanticLabel,
-    bool excludeFromSemantics = false,
-    double? scale,
-    double? width,
-    double? height,
-    Color? color,
-    Animation<double>? opacity,
-    BlendMode? colorBlendMode,
-    BoxFit? fit,
-    Alignment alignment = Alignment.center,
-    ImageRepeat repeat = ImageRepeat.noRepeat,
-    Rect? centerSlice,
-    bool matchTextDirection = false,
-    bool gaplessPlayback = false,
-    bool isAntiAlias = false,
-    String package = 'catalyst_voices_assets',
-    FilterQuality filterQuality = FilterQuality.low,
-    int? cacheWidth,
-    int? cacheHeight,
-  }) : super.asset(
-          name,
-          bundle: bundle,
-          frameBuilder: frameBuilder,
-          errorBuilder: errorBuilder,
-          semanticLabel: semanticLabel,
-          excludeFromSemantics: excludeFromSemantics,
-          scale: scale,
-          width: width,
-          height: height,
-          color: color,
-          opacity: opacity,
-          colorBlendMode: colorBlendMode,
-          fit: fit,
-          alignment: alignment,
-          repeat: repeat,
-          centerSlice: centerSlice,
-          matchTextDirection: matchTextDirection,
-          gaplessPlayback: gaplessPlayback,
-          isAntiAlias: isAntiAlias,
-          filterQuality: filterQuality,
-          cacheWidth: cacheWidth,
-          cacheHeight: cacheHeight,
-          package: package,
-        );
+    super.name, {
+    super.key,
+    super.bundle,
+    super.frameBuilder,
+    super.errorBuilder,
+    super.semanticLabel,
+    super.excludeFromSemantics,
+    super.scale,
+    super.width,
+    super.height,
+    super.color,
+    super.opacity,
+    super.colorBlendMode,
+    super.fit,
+    Alignment super.alignment,
+    super.repeat,
+    super.centerSlice,
+    super.matchTextDirection,
+    super.gaplessPlayback,
+    super.isAntiAlias,
+    String super.package = 'catalyst_voices_assets',
+    super.filterQuality = FilterQuality.low,
+    super.cacheWidth,
+    super.cacheHeight,
+  }) : super.asset();
 }
diff --git a/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_svg_picture.dart b/catalyst_voices/packages/catalyst_voices_assets/lib/src/catalyst_svg_picture.dart
@@ -6,7 +6,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 /// every time.
 /// For more information, see [SvgPicture.asset].
 final class CatalystSvgPicture extends SvgPicture {
-  CatalystSvgPicture(
+  const CatalystSvgPicture(
     super.bytesLoader, {
     super.key,
     super.width,
@@ -27,7 +27,7 @@ final class CatalystSvgPicture extends SvgPicture {
     super.key,
     super.matchTextDirection,
     super.bundle,
-    String? super.package = 'catalyst_voices_assets',
+    super.package = 'catalyst_voices_assets',
     super.width,
     super.height,
     super.fit,

diff --git a/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml b/catalyst_voices/packages/catalyst_voices_assets/pubspec.yaml
@@ -4,16 +4,17 @@ version: 0.1.0+1
 publish_to: none
 
 environment:
-  sdk: ">=3.3.4 <4.0.0"
-  flutter: ">=3.22.1"
+  sdk: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.1"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_svg: ^2.0.10+1
 
 dev_dependencies:
-  build_runner: ^2.3.3
+  build_runner: ^2.4.12
+  catalyst_analysis: ^1.2.0
   flutter_gen_runner: ^5.3.2
 
 flutter:

diff --git a/catalyst_voices/packages/catalyst_voices_blocs/analysis_options.yaml b/catalyst_voices/packages/catalyst_voices_blocs/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:catalyst_analysis/analysis_options.1.0.0.yaml
+include: package:catalyst_analysis/analysis_options.yaml
 
 analyzer:
   exclude: [

diff --git a/catalyst_voices/packages/catalyst_voices_blocs/lib/src/brand/brand_bloc.dart b/catalyst_voices/packages/catalyst_voices_blocs/lib/src/brand/brand_bloc.dart
@@ -7,19 +7,19 @@ part 'brand_event.dart';
 part 'brand_state.dart';
 
 /// [BrandBloc] is a Bloc responsible for managing the brand state.
-/// 
+///
 /// This Bloc listens for [BrandEvent]s and updates the [BrandState]
 /// accordingly.
-/// The [BrandState] can be consumed by the [MaterialApp] to build the 
+/// The [BrandState] can be consumed by the [MaterialApp] to build the
 /// appropriate [ThemeData] based on the [BrandKey] stored in the state.
-/// 
+///
 /// To build the appropriate [ThemeData] based on the [BrandKey] is
 /// possible to use the [ThemeBuilder] utility form the `catalyst_voices_brands`
 /// package.
 ///
 /// The [BrandChangedEvent] accepts a [BrandKey] a simple enum that
 /// contains all possible brands/themes.
-/// 
+///
 /// To trigger the theme change is just necessary to dispatch the
 /// [BrandChangedEvent] with the appropriate key:
 ///
@@ -71,5 +71,4 @@ final class BrandBloc extends Bloc<BrandEvent, BrandState> {
   ) {
     emit(BrandState(brandKey: event.brand));
   }
-
 }
diff --git a/catalyst_voices/packages/catalyst_voices_blocs/lib/src/brand/brand_state.dart b/catalyst_voices/packages/catalyst_voices_blocs/lib/src/brand/brand_state.dart
@@ -4,7 +4,7 @@ final class BrandState extends Equatable {
   final BrandKey? brandKey;
 
   const BrandState({BrandKey? brandKey})
-    : brandKey = brandKey ?? BrandKey.catalyst;
+      : brandKey = brandKey ?? BrandKey.catalyst;
 
   @override
   List<Object> get props => [brandKey ?? ''];
-Original file line number
+Diff line change
@@ Expand Up / @@ -247,3 +247,5 @@ unchunk @@
     EUTXO
     eddsa
     toggleable
+    interps
+    todos