From afb47be57efba8499e21dfc4c7349355f1a09e07 Mon Sep 17 00:00:00 2001
From: Fernando Trigoso <fertrig@gmail.com>
Date: Mon, 10 Mar 2025 12:56:30 -0400
Subject: [PATCH 1/3] Upgrades all monarch packages

Upgrades dependencies and Dart SDK of all these packages:
- monarch
- monarch_annotations
- monarch_definitions
- monarch_grpc
- monarch_http
- monarch_io_utils
- monarch_utils

Upgrade Flutter SDK of monarch package.
Lints and fixes deprecations issues.
---
 packages/monarch/CHANGELOG.md                    |  6 ++++++
 .../monarch/lib/src/builders/main_builder.dart   |  2 +-
 .../src/builders/meta_localizations_builder.dart |  2 +-
 packages/monarch/pubspec.yaml                    | 14 +++++++-------
 packages/monarch_annotations/CHANGELOG.md        |  5 +++++
 packages/monarch_annotations/pubspec.yaml        |  4 ++--
 packages/monarch_definitions/CHANGELOG.md        |  4 ++++
 packages/monarch_definitions/pubspec.yaml        |  6 +++---
 packages/monarch_grpc/CHANGELOG.md               |  4 ++++
 packages/monarch_grpc/pubspec.yaml               | 10 +++++-----
 packages/monarch_http/CHANGELOG.md               |  4 ++++
 packages/monarch_http/pubspec.yaml               |  8 ++++----
 packages/monarch_io_utils/CHANGELOG.md           |  4 ++++
 .../monarch_io_utils/lib/src/flutter_sdk_id.dart | 16 ++++++++--------
 packages/monarch_io_utils/pubspec.yaml           |  6 +++---
 .../non_interactive_process_windows_test.dart    |  1 +
 .../test/platform_utils_macos_test.dart          |  1 +
 .../test/platform_utils_windows_test.dart        |  1 +
 packages/monarch_utils/CHANGELOG.md              |  4 ++++
 packages/monarch_utils/lib/log.dart              |  2 +-
 .../lib/src/log/log_process_result.dart          |  6 +++---
 packages/monarch_utils/lib/timers.dart           |  2 +-
 packages/monarch_utils/pubspec.yaml              |  6 +++---
 23 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/packages/monarch/CHANGELOG.md b/packages/monarch/CHANGELOG.md
index 69007d7c..e52368e9 100644
--- a/packages/monarch/CHANGELOG.md
+++ b/packages/monarch/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 3.9.0
+2025-03-06
+- Upgrades dependencies: source_gen, dart_style, analyzer, lints
+- Lints
+- Sets Flutter SDK constraint to greater than 3.22.0-0.1.pre
+
 ### 3.8.1
 2024-05-16
 - Update vm_service dependency to `>=9.4.0 <15.0.0`.
diff --git a/packages/monarch/lib/src/builders/main_builder.dart b/packages/monarch/lib/src/builders/main_builder.dart
index 95edce16..59f5fb16 100644
--- a/packages/monarch/lib/src/builders/main_builder.dart
+++ b/packages/monarch/lib/src/builders/main_builder.dart
@@ -46,7 +46,7 @@ class MainBuilder implements Builder {
         _getMetaItemsStatements(metaThemesIdMap, 'metaThemeItems'),
         _getMetaStoriesMap(metaStoriesIdMap));
 
-    var formatter = DartFormatter();
+    var formatter = DartFormatter(languageVersion: DartFormatter.latestLanguageVersion);
     var formattedOutput = formatter.format(output);
 
     await buildStep.writeAsString(outputId, formattedOutput);
diff --git a/packages/monarch/lib/src/builders/meta_localizations_builder.dart b/packages/monarch/lib/src/builders/meta_localizations_builder.dart
index 758bb2cc..aa536ae0 100644
--- a/packages/monarch/lib/src/builders/meta_localizations_builder.dart
+++ b/packages/monarch/lib/src/builders/meta_localizations_builder.dart
@@ -66,7 +66,7 @@ class MetaLocalizationsBuilder implements Builder {
 Proposed change:
 ```
 @MonarchLocalizations(...)
-${element.type.getDisplayString(withNullability: false)} get ${element.name} => ...
+${element.type.getDisplayString()} get ${element.name} => ...
 ```
 
 After you make the change, run `monarch run` again.
diff --git a/packages/monarch/pubspec.yaml b/packages/monarch/pubspec.yaml
index 2a1d247a..91579795 100644
--- a/packages/monarch/pubspec.yaml
+++ b/packages/monarch/pubspec.yaml
@@ -1,6 +1,6 @@
 name: monarch
 description: Code generator for Monarch. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 3.8.1
+version: 3.9.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
@@ -22,8 +22,8 @@ screenshots:
     path: screenshots/04-find-bugs-fs8.png
 
 environment:
-  sdk: '>=3.2.0 <4.0.0'
-  flutter: '>=3.17.0-0.0.pre'
+  sdk: ^3.2.0
+  flutter: '>=3.22.0-0.1.pre'
 
 dependencies:
   flutter:
@@ -31,13 +31,13 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   build: ^2.0.0
-  source_gen: ^1.0.0
-  dart_style: ^2.0.0
+  source_gen: ^2.0.0
+  dart_style: ^3.0.1
   monarch_definitions: ^1.5.0
   monarch_annotations: ^1.0.0
   monarch_utils: ^1.0.0
   glob: ^2.0.1
-  analyzer: ^6.0.0
+  analyzer: ^7.3.0
   path: ^1.8.0
   vm_service: '>=9.4.0 <15.0.0'
   meta: ^1.3.0
@@ -46,7 +46,7 @@ dependencies:
     sdk: flutter
 
 dev_dependencies: 
-  lints: ^3.0.0
+  lints: ^5.1.1
 
 flutter:
 
diff --git a/packages/monarch_annotations/CHANGELOG.md b/packages/monarch_annotations/CHANGELOG.md
index d5e114b9..66d41296 100644
--- a/packages/monarch_annotations/CHANGELOG.md
+++ b/packages/monarch_annotations/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.1.0
+2025-03-06
+- Lints
+- Sets Dart sdk constraint to 3.2.0
+
 ### 1.0.4
 2023-10-23
 - Deprecate MonarchTheme.isDefault flag.
diff --git a/packages/monarch_annotations/pubspec.yaml b/packages/monarch_annotations/pubspec.yaml
index ac95a8f5..8478698e 100644
--- a/packages/monarch_annotations/pubspec.yaml
+++ b/packages/monarch_annotations/pubspec.yaml
@@ -1,6 +1,6 @@
 name: monarch_annotations
 description: Annotations for Monarch. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 1.0.4
+version: 1.1.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
@@ -12,4 +12,4 @@ topics:
   - stories
 
 environment:
-  sdk: '>=2.12.0 <4.0.0'
+  sdk: ^3.2.0
diff --git a/packages/monarch_definitions/CHANGELOG.md b/packages/monarch_definitions/CHANGELOG.md
index f31ec189..1f892d55 100644
--- a/packages/monarch_definitions/CHANGELOG.md
+++ b/packages/monarch_definitions/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.6.0
+2025-03-10
+- Update dependencies and sdk.
+
 ### 1.5.1
 2023-08-25
 - Rollback Material 3 standard themes.
diff --git a/packages/monarch_definitions/pubspec.yaml b/packages/monarch_definitions/pubspec.yaml
index 46a88e78..52745e40 100644
--- a/packages/monarch_definitions/pubspec.yaml
+++ b/packages/monarch_definitions/pubspec.yaml
@@ -1,15 +1,15 @@
 name: monarch_definitions
 description: Types and channel definitions for Monarch. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 1.5.1
+version: 1.6.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
 documentation: https://monarchapp.io/docs/introduction
 
 environment:
-  sdk: '>=2.12.0 <4.0.0'
+  sdk: ^3.2.0
 
 dependencies:
 
 dev_dependencies:
-  lints: ^2.0.1
+  lints: ^5.1.1
diff --git a/packages/monarch_grpc/CHANGELOG.md b/packages/monarch_grpc/CHANGELOG.md
index 50c2826d..7a8353dc 100644
--- a/packages/monarch_grpc/CHANGELOG.md
+++ b/packages/monarch_grpc/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 2.4.0 - 2025-03-06
+- Upgrades major versions of dependencies: grpc, protobuf, lints
+- Sets sdk constraint to ^3.2.0
+
 ### 2.3.1 - 2023-10-06
 - Use grpc version 3.2.4
 
diff --git a/packages/monarch_grpc/pubspec.yaml b/packages/monarch_grpc/pubspec.yaml
index 1a4e21f4..ff2c1f67 100644
--- a/packages/monarch_grpc/pubspec.yaml
+++ b/packages/monarch_grpc/pubspec.yaml
@@ -1,18 +1,18 @@
 name: monarch_grpc
 description: gRPC interfaces for Monarch. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 2.3.1
+version: 2.4.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
 documentation: https://monarchapp.io/docs/introduction
 
 environment:
-  sdk: '>=2.12.0 <4.0.0'
+  sdk: ^3.2.0
 
 dependencies:
-  grpc: ^3.2.4
-  protobuf: ^2.1.0
+  grpc: ^4.0.1
+  protobuf: ^3.1.0
   monarch_definitions: ^1.4.0
 
 dev_dependencies:
-  lints: ^2.0.1
+  lints: ^5.1.1
diff --git a/packages/monarch_http/CHANGELOG.md b/packages/monarch_http/CHANGELOG.md
index 1c6318c0..791381bb 100644
--- a/packages/monarch_http/CHANGELOG.md
+++ b/packages/monarch_http/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.0 - 2025-03-06
+- Upgrades major versions of dependencies: http, lints
+- Upgrade sdk
+
 ## 1.2.0 - 2022-09-13
 - Renamed lib/utils.dart to lib/monarch_http.dart
 - Publishing to pub.dev
diff --git a/packages/monarch_http/pubspec.yaml b/packages/monarch_http/pubspec.yaml
index 5518d710..d45e5989 100644
--- a/packages/monarch_http/pubspec.yaml
+++ b/packages/monarch_http/pubspec.yaml
@@ -1,17 +1,17 @@
 name: monarch_http
 description: Http utilities for Monarch. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 1.2.0
+version: 1.3.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
 documentation: https://monarchapp.io/docs/introduction
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.2.0
 
 dependencies:
-  http: ^0.13.1
+  http: ^1.3.0
   monarch_utils: ^1.0.4
 
 dev_dependencies:
-  lints: ^1.0.1
+  lints: ^5.1.1
diff --git a/packages/monarch_io_utils/CHANGELOG.md b/packages/monarch_io_utils/CHANGELOG.md
index 95c8ee2b..68a52097 100644
--- a/packages/monarch_io_utils/CHANGELOG.md
+++ b/packages/monarch_io_utils/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.0 - 2025-03-06
+- Fixes lints
+- Upgrades dependencies and sdk
+
 ## 1.3.0 - 2023-01-10
 - Linux support in platform_utils function, backwards compatible.
 
diff --git a/packages/monarch_io_utils/lib/src/flutter_sdk_id.dart b/packages/monarch_io_utils/lib/src/flutter_sdk_id.dart
index 937b72f0..5b60801c 100644
--- a/packages/monarch_io_utils/lib/src/flutter_sdk_id.dart
+++ b/packages/monarch_io_utils/lib/src/flutter_sdk_id.dart
@@ -48,11 +48,11 @@ class FlutterSdkId extends Object {
     if (pattern.hasMatch(stringId)) {
       var match = pattern.firstMatch(stringId)!;
       if (match.groupCount == 3) {
-        var _os = match.group(1)!;
-        var _version = match.group(2)!;
-        var _channel = match.group(3)!;
+        var os_ = match.group(1)!;
+        var version_ = match.group(2)!;
+        var channel_ = match.group(3)!;
         return FlutterSdkId(
-            channel: _channel, version: _version, operatingSystem: _os);
+            channel: channel_, version: version_, operatingSystem: os_);
       }
     }
     throw ArgumentError(
@@ -82,11 +82,11 @@ class FlutterSdkId extends Object {
     if (pattern.hasMatch(flutterVersionOutput)) {
       var match = pattern.firstMatch(flutterVersionOutput)!;
       if (match.groupCount == 2) {
-        var _version = match.group(1)!;
-        var _channel = match.group(2)!;
+        var version_ = match.group(1)!;
+        var channel_ = match.group(2)!;
         return FlutterSdkId(
-            channel: _channel,
-            version: _version,
+            channel: channel_,
+            version: version_,
             operatingSystem: operatingSystem);
       }
     }
diff --git a/packages/monarch_io_utils/pubspec.yaml b/packages/monarch_io_utils/pubspec.yaml
index bea7c299..524e2443 100644
--- a/packages/monarch_io_utils/pubspec.yaml
+++ b/packages/monarch_io_utils/pubspec.yaml
@@ -1,18 +1,18 @@
 name: monarch_io_utils
 description: Monarch utilities for dart io and other dart sdk packages.
-version: 1.3.0
+version: 1.4.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
 documentation: https://monarchapp.io/docs/introduction
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.2.0
 
 dependencies:
   path: ^1.8.0
   meta: ^1.7.0
 
 dev_dependencies:
-  lints: ^1.0.1
+  lints: ^5.1.1
   test: ^1.16.8
diff --git a/packages/monarch_io_utils/test/non_interactive_process_windows_test.dart b/packages/monarch_io_utils/test/non_interactive_process_windows_test.dart
index 04c4f32c..0500634e 100644
--- a/packages/monarch_io_utils/test/non_interactive_process_windows_test.dart
+++ b/packages/monarch_io_utils/test/non_interactive_process_windows_test.dart
@@ -1,4 +1,5 @@
 @TestOn('windows')
+library;
 
 import 'dart:convert';
 import 'package:test/test.dart';
diff --git a/packages/monarch_io_utils/test/platform_utils_macos_test.dart b/packages/monarch_io_utils/test/platform_utils_macos_test.dart
index 19e8f5da..06724125 100644
--- a/packages/monarch_io_utils/test/platform_utils_macos_test.dart
+++ b/packages/monarch_io_utils/test/platform_utils_macos_test.dart
@@ -1,4 +1,5 @@
 @TestOn('mac-os')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/packages/monarch_io_utils/test/platform_utils_windows_test.dart b/packages/monarch_io_utils/test/platform_utils_windows_test.dart
index 599eaacd..5e0c6e58 100644
--- a/packages/monarch_io_utils/test/platform_utils_windows_test.dart
+++ b/packages/monarch_io_utils/test/platform_utils_windows_test.dart
@@ -1,4 +1,5 @@
 @TestOn('windows')
+library;
 
 import 'package:test/test.dart';
 
diff --git a/packages/monarch_utils/CHANGELOG.md b/packages/monarch_utils/CHANGELOG.md
index 8b987a26..4d192143 100644
--- a/packages/monarch_utils/CHANGELOG.md
+++ b/packages/monarch_utils/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.0 - 2025-03-06
+- Lints
+- Upgrades dependencies and sdk.
+
 ## 1.1.0 - 2022-12-21
 - Add debouncer
 - Create library timers
diff --git a/packages/monarch_utils/lib/log.dart b/packages/monarch_utils/lib/log.dart
index 2c993db0..b7a538a7 100644
--- a/packages/monarch_utils/lib/log.dart
+++ b/packages/monarch_utils/lib/log.dart
@@ -1,4 +1,4 @@
-library log;
+library;
 
 export 'src/log/log.dart';
 export 'src/log/log_process_result.dart';
diff --git a/packages/monarch_utils/lib/src/log/log_process_result.dart b/packages/monarch_utils/lib/src/log/log_process_result.dart
index cfb84dab..54038528 100644
--- a/packages/monarch_utils/lib/src/log/log_process_result.dart
+++ b/packages/monarch_utils/lib/src/log/log_process_result.dart
@@ -1,15 +1,15 @@
 import 'dart:io';
 import 'log.dart';
 
-void logUnsuccessfulProcessResult(ProcessResult result, Log _log) {
+void logUnsuccessfulProcessResult(ProcessResult result, Log log_) {
   final stdout = result.stdout;
   final stderr = result.stderr;
 
   if (stdout is String) {
-    _log.log.severe('stdout output:\n$stdout');
+    log_.log.severe('stdout output:\n$stdout');
   }
 
   if (stderr is String && stderr.isNotEmpty) {
-    _log.log.severe('stderr output:\n$stderr');
+    log_.log.severe('stderr output:\n$stderr');
   }
 }
diff --git a/packages/monarch_utils/lib/timers.dart b/packages/monarch_utils/lib/timers.dart
index a4334e40..b4ce6cc0 100644
--- a/packages/monarch_utils/lib/timers.dart
+++ b/packages/monarch_utils/lib/timers.dart
@@ -1,4 +1,4 @@
-library timers;
+library;
 
 export 'src/timers/stopwatch.dart';
 export 'src/timers/heartbeat.dart';
diff --git a/packages/monarch_utils/pubspec.yaml b/packages/monarch_utils/pubspec.yaml
index 91512066..79bcb9cc 100644
--- a/packages/monarch_utils/pubspec.yaml
+++ b/packages/monarch_utils/pubspec.yaml
@@ -1,16 +1,16 @@
 name: monarch_utils
 description: Utilities for the monarch package. Monarch is a tool for building Flutter widgets in isolation. It makes it easy to build, test and debug complex UIs.
-version: 1.1.0
+version: 1.2.0
 homepage: https://monarchapp.io
 repository: https://github.com/Dropsource/monarch
 issue_tracker: https://github.com/Dropsource/monarch/issues
 documentation: https://monarchapp.io/docs/introduction
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.2.0
 
 dependencies:
 
 dev_dependencies:
-  lints: ^1.0.1
+  lints: ^5.1.1
   test: ^1.16.8

From cca62e844c52154b51658cd2ee7bcb5f10e67f62 Mon Sep 17 00:00:00 2001
From: Fernando Trigoso <fertrig@gmail.com>
Date: Mon, 10 Mar 2025 13:03:49 -0400
Subject: [PATCH 2/3] monarch_definitions: fixes lint warning

---
 packages/monarch_definitions/lib/src/target_platform.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/monarch_definitions/lib/src/target_platform.dart b/packages/monarch_definitions/lib/src/target_platform.dart
index 8d2d6854..187e7b82 100644
--- a/packages/monarch_definitions/lib/src/target_platform.dart
+++ b/packages/monarch_definitions/lib/src/target_platform.dart
@@ -9,8 +9,6 @@ String targetPlatformToString(MonarchTargetPlatform platform) {
       return _ios;
     case MonarchTargetPlatform.android:
       return _android;
-    default:
-      throw 'Unexpected target platform value $platform';
   }
 }
 

From 3d35d127c5917cc13e259f8bf58e1abf021e883b Mon Sep 17 00:00:00 2001
From: Fernando Trigoso <fertrig@gmail.com>
Date: Mon, 10 Mar 2025 13:29:47 -0400
Subject: [PATCH 3/3] Test monarch package using flutter stable

---
 .github/workflows/test-package.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
index 225df1dd..0d38b0e1 100644
--- a/.github/workflows/test-package.yml
+++ b/.github/workflows/test-package.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
         with:
-          channel: 'beta' # or: 'beta', 'dev' or 'master'
+          channel: 'stable' # or: 'beta', 'dev' or 'master'
       - run: flutter --version
 
       - name: Install dependencies