Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions packages/monarch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion packages/monarch/lib/src/builders/main_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions packages/monarch/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -22,22 +22,22 @@ 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:
sdk: flutter
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
Expand All @@ -46,7 +46,7 @@ dependencies:
sdk: flutter

dev_dependencies:
lints: ^3.0.0
lints: ^5.1.1

flutter:

5 changes: 5 additions & 0 deletions packages/monarch_annotations/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions packages/monarch_annotations/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,4 +12,4 @@ topics:
- stories

environment:
sdk: '>=2.12.0 <4.0.0'
sdk: ^3.2.0
4 changes: 4 additions & 0 deletions packages/monarch_definitions/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 0 additions & 2 deletions packages/monarch_definitions/lib/src/target_platform.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ String targetPlatformToString(MonarchTargetPlatform platform) {
return _ios;
case MonarchTargetPlatform.android:
return _android;
default:
throw 'Unexpected target platform value $platform';
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/monarch_definitions/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions packages/monarch_grpc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
10 changes: 5 additions & 5 deletions packages/monarch_grpc/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions packages/monarch_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions packages/monarch_http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions packages/monarch_io_utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
16 changes: 8 additions & 8 deletions packages/monarch_io_utils/lib/src/flutter_sdk_id.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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);
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/monarch_io_utils/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@TestOn('windows')
library;

import 'dart:convert';
import 'package:test/test.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@TestOn('mac-os')
library;

import 'package:test/test.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@TestOn('windows')
library;

import 'package:test/test.dart';

Expand Down
4 changes: 4 additions & 0 deletions packages/monarch_utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/monarch_utils/lib/log.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library log;
library;

export 'src/log/log.dart';
export 'src/log/log_process_result.dart';
Expand Down
6 changes: 3 additions & 3 deletions packages/monarch_utils/lib/src/log/log_process_result.dart
Original file line number Diff line number Diff line change
@@ -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');
}
}
2 changes: 1 addition & 1 deletion packages/monarch_utils/lib/timers.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library timers;
library;

export 'src/timers/stopwatch.dart';
export 'src/timers/heartbeat.dart';
Expand Down
6 changes: 3 additions & 3 deletions packages/monarch_utils/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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