From f4ea69f817cc30aa5c3e6388aa8eb1f3bcc3d8c5 Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 14:50:56 +0100 Subject: [PATCH 1/6] Pass config to patrol_log --- packages/patrol/CHANGELOG.md | 4 ++++ packages/patrol/lib/src/common.dart | 2 +- packages/patrol/pubspec.yaml | 6 +++--- packages/patrol_cli/CHANGELOG.md | 4 ++++ packages/patrol_cli/lib/src/base/constants.dart | 2 +- packages/patrol_cli/pubspec.yaml | 4 ++-- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/patrol/CHANGELOG.md b/packages/patrol/CHANGELOG.md index 7d1452922..d06b75795 100644 --- a/packages/patrol/CHANGELOG.md +++ b/packages/patrol/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.13.0-dev.5 + +- Pass config to `patrol_log`. + ## 3.13.0-dev.4 - Bump `patrol_finders` and `patrol_log` diff --git a/packages/patrol/lib/src/common.dart b/packages/patrol/lib/src/common.dart index 46d1b91ef..5bddd31c8 100644 --- a/packages/patrol/lib/src/common.dart +++ b/packages/patrol/lib/src/common.dart @@ -97,7 +97,7 @@ void patrolTest( LiveTestWidgetsFlutterBindingFramePolicy framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fadePointers, }) { - final patrolLog = PatrolLogWriter(); + final patrolLog = PatrolLogWriter(config: {'printLogs': config.printLogs}); final automator = NativeAutomator(config: nativeAutomatorConfig); final automator2 = NativeAutomator2(config: nativeAutomatorConfig); final patrolBinding = PatrolBinding.ensureInitialized(nativeAutomatorConfig) diff --git a/packages/patrol/pubspec.yaml b/packages/patrol/pubspec.yaml index 96c493ba1..65abfeb1b 100644 --- a/packages/patrol/pubspec.yaml +++ b/packages/patrol/pubspec.yaml @@ -2,7 +2,7 @@ name: patrol description: > Powerful Flutter-native UI testing framework overcoming limitations of existing Flutter testing tools. Ready for action! -version: 3.13.0-dev.4 +version: 3.13.0-dev.5 homepage: https://patrol.leancode.co repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol issue_tracker: https://github.com/leancodepl/patrol/issues @@ -26,8 +26,8 @@ dependencies: http: '^1.1.0' json_annotation: ^4.8.1 meta: ^1.10.0 - patrol_finders: ^2.4.0 - patrol_log: ^0.1.0 + patrol_finders: ^2.4.1 + patrol_log: ^0.2.0 shelf: ^1.4.1 test_api: '^0.7.0' diff --git a/packages/patrol_cli/CHANGELOG.md b/packages/patrol_cli/CHANGELOG.md index ed5df7e84..61ee125f3 100644 --- a/packages/patrol_cli/CHANGELOG.md +++ b/packages/patrol_cli/CHANGELOG.md @@ -1,3 +1,7 @@ +## 3.4.0-dev.4 + +- Bump `patrol_log`. + ## 3.4.0-dev.3 - Add flag `clear-test-steps`. (#2421) diff --git a/packages/patrol_cli/lib/src/base/constants.dart b/packages/patrol_cli/lib/src/base/constants.dart index 03fd7460a..98da5cdff 100644 --- a/packages/patrol_cli/lib/src/base/constants.dart +++ b/packages/patrol_cli/lib/src/base/constants.dart @@ -1,3 +1,3 @@ /// Version of Patrol CLI. Must be kept in sync with pubspec.yaml. /// If you update this, make sure that compatibility-table.mdx is updated (if needed) -const version = '3.4.0-dev.3'; +const version = '3.4.0-dev.4'; diff --git a/packages/patrol_cli/pubspec.yaml b/packages/patrol_cli/pubspec.yaml index 565ac6bd8..46551718e 100644 --- a/packages/patrol_cli/pubspec.yaml +++ b/packages/patrol_cli/pubspec.yaml @@ -1,7 +1,7 @@ name: patrol_cli description: > Command-line tool for Patrol, a powerful Flutter-native UI testing framework. -version: 3.4.0-dev.3 # Must be kept in sync with constants.dart +version: 3.4.0-dev.4 # Must be kept in sync with constants.dart homepage: https://patrol.leancode.co repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol_cli issue_tracker: https://github.com/leancodepl/patrol/issues?q=is%3Aopen+is%3Aissue+label%3A%22package%3A+patrol_cli%22 @@ -30,7 +30,7 @@ dependencies: mason_logger: ^0.2.10 meta: ^1.10.0 path: ^1.8.3 - patrol_log: ^0.1.0 + patrol_log: ^0.2.0 platform: ^3.1.3 process: ^5.0.1 pub_updater: ^0.4.0 From 2ec50d21a8da67a2b72fb0ec32784414eeae2302 Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 17:36:02 +0100 Subject: [PATCH 2/6] Prepare `patrol` and `patrol_cli` to release --- docs/compatibility-table.mdx | 3 ++- packages/patrol/CHANGELOG.md | 21 +++---------------- packages/patrol/pubspec.yaml | 2 +- packages/patrol_cli/CHANGELOG.md | 16 +++----------- .../compatibility_checker.dart | 8 +++++++ 5 files changed, 17 insertions(+), 33 deletions(-) diff --git a/docs/compatibility-table.mdx b/docs/compatibility-table.mdx index 91b068203..eea27570d 100644 --- a/docs/compatibility-table.mdx +++ b/docs/compatibility-table.mdx @@ -13,7 +13,8 @@ the table below to assess which version you should use. | patrol_cli | patrol | Min Flutter Version | | -------------- | -------------- | ------------------- | -| 3.3.0+ | 3.12.0+ | 3.24.0 | +| 3.4.0+ | 3.13.0+ | 3.24.0 | +| 3.3.0 | 3.12.0 | 3.24.0 | | 3.2.1 | 3.11.2 | 3.24.0 | | 3.2.0 | 3.11.0 - 3.11.1| 3.22.0 | | 3.1.0 - 3.1.1 | 3.10.0 | 3.22.0 | diff --git a/packages/patrol/CHANGELOG.md b/packages/patrol/CHANGELOG.md index d06b75795..fe09b83aa 100644 --- a/packages/patrol/CHANGELOG.md +++ b/packages/patrol/CHANGELOG.md @@ -1,25 +1,10 @@ -## 3.13.0-dev.5 - -- Pass config to `patrol_log`. - -## 3.13.0-dev.4 - -- Bump `patrol_finders` and `patrol_log` - -## 3.13.0-dev.3 +## 3.13.0 +- Add support for the `patrol_log` package. (#2387) +- Fix tapping on notification on iOS 18. (#2394) - Fix macos functionality. (#2408) - Bump `patrol_finders` and enable logging. -## 3.13.0-dev.2 - -- Bump `patrol_log` version. - -## 3.13.0-dev.1 - -- Add support for the patrol_log package. (#2387) -- Fix tapping on notification on iOS 18. (#2394) - ## 3.12.0 - Add `clear-permissions` flag on ios commands. (#2367) diff --git a/packages/patrol/pubspec.yaml b/packages/patrol/pubspec.yaml index 65abfeb1b..54d482893 100644 --- a/packages/patrol/pubspec.yaml +++ b/packages/patrol/pubspec.yaml @@ -2,7 +2,7 @@ name: patrol description: > Powerful Flutter-native UI testing framework overcoming limitations of existing Flutter testing tools. Ready for action! -version: 3.13.0-dev.5 +version: 3.13.0 homepage: https://patrol.leancode.co repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol issue_tracker: https://github.com/leancodepl/patrol/issues diff --git a/packages/patrol_cli/CHANGELOG.md b/packages/patrol_cli/CHANGELOG.md index 61ee125f3..d199264df 100644 --- a/packages/patrol_cli/CHANGELOG.md +++ b/packages/patrol_cli/CHANGELOG.md @@ -1,18 +1,8 @@ -## 3.4.0-dev.4 +## 3.4.0 -- Bump `patrol_log`. +- Add support for the `patrol_log` package. (#2387) -## 3.4.0-dev.3 - -- Add flag `clear-test-steps`. (#2421) - -## 3.4.0-dev.2 - -- Bump `patrol_log` version. (#2402) - -## 3.4.0-dev.1 - -- Add support for the patrol_log package. (#2387) +This version requires version 3.13.0 of `patrol` package. ## 3.3.0 diff --git a/packages/patrol_cli/lib/src/compatibility_checker/compatibility_checker.dart b/packages/patrol_cli/lib/src/compatibility_checker/compatibility_checker.dart index 212548e51..2f5e47ab4 100644 --- a/packages/patrol_cli/lib/src/compatibility_checker/compatibility_checker.dart +++ b/packages/patrol_cli/lib/src/compatibility_checker/compatibility_checker.dart @@ -211,6 +211,10 @@ final _patrolVersionRange = [ ), VersionRange( min: Version.parse('3.12.0'), + max: Version.parse('3.12.0'), + ), + VersionRange( + min: Version.parse('3.13.0'), ), ]; @@ -257,5 +261,9 @@ final _patrolCliVersionRange = [ ), VersionRange( min: Version.parse('3.3.0'), + max: Version.parse('3.3.0'), + ), + VersionRange( + min: Version.parse('3.4.0'), ), ]; From 8986f6a57730f8c2d580aa1165a46a0ea58126f2 Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 17:39:07 +0100 Subject: [PATCH 3/6] Update version in `constants.dart` --- packages/patrol_cli/lib/src/base/constants.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/patrol_cli/lib/src/base/constants.dart b/packages/patrol_cli/lib/src/base/constants.dart index 98da5cdff..d7fcb8c78 100644 --- a/packages/patrol_cli/lib/src/base/constants.dart +++ b/packages/patrol_cli/lib/src/base/constants.dart @@ -1,3 +1,3 @@ /// Version of Patrol CLI. Must be kept in sync with pubspec.yaml. /// If you update this, make sure that compatibility-table.mdx is updated (if needed) -const version = '3.4.0-dev.4'; +const version = '3.4.0'; From 03dfc23ecf82620597da5ebc477a2615924e2a4b Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 17:42:16 +0100 Subject: [PATCH 4/6] Add info about min required `patrol_cli` version in `patrol` changelog --- packages/patrol/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/patrol/CHANGELOG.md b/packages/patrol/CHANGELOG.md index fe09b83aa..f69a43b08 100644 --- a/packages/patrol/CHANGELOG.md +++ b/packages/patrol/CHANGELOG.md @@ -5,6 +5,8 @@ - Fix macos functionality. (#2408) - Bump `patrol_finders` and enable logging. +This version requires version 3.4.0 of `patrol_cli` package. + ## 3.12.0 - Add `clear-permissions` flag on ios commands. (#2367) From 3d964d8523e56900cbf983692255f27d08342a65 Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 17:52:17 +0100 Subject: [PATCH 5/6] Change `patrol_cli` version --- packages/patrol_cli/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/patrol_cli/pubspec.yaml b/packages/patrol_cli/pubspec.yaml index 46551718e..8cfc211e5 100644 --- a/packages/patrol_cli/pubspec.yaml +++ b/packages/patrol_cli/pubspec.yaml @@ -1,7 +1,7 @@ name: patrol_cli description: > Command-line tool for Patrol, a powerful Flutter-native UI testing framework. -version: 3.4.0-dev.4 # Must be kept in sync with constants.dart +version: 3.4.0 # Must be kept in sync with constants.dart homepage: https://patrol.leancode.co repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol_cli issue_tracker: https://github.com/leancodepl/patrol/issues?q=is%3Aopen+is%3Aissue+label%3A%22package%3A+patrol_cli%22 From e599642f4ccf1d08bc0ff7dc4f2274086070bfab Mon Sep 17 00:00:00 2001 From: pdenert Date: Fri, 22 Nov 2024 19:07:45 +0100 Subject: [PATCH 6/6] Ignore `must_be_immutable` in pubspec_reader --- packages/patrol_cli/lib/src/pubspec_reader.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/patrol_cli/lib/src/pubspec_reader.dart b/packages/patrol_cli/lib/src/pubspec_reader.dart index f6fa1cd80..89bccca9c 100644 --- a/packages/patrol_cli/lib/src/pubspec_reader.dart +++ b/packages/patrol_cli/lib/src/pubspec_reader.dart @@ -1,3 +1,6 @@ +// TODO: manage immutable classes +// ignore_for_file: must_be_immutable + import 'package:equatable/equatable.dart'; import 'package:file/file.dart'; import 'package:yaml/yaml.dart';