From 2bacc8be973f5d58d7746b23f946130bc47de123 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Mon, 9 Sep 2024 15:53:03 +0100
Subject: [PATCH 01/19] Hardcode custom web port for testing

---
 packages/fluttium_driver/lib/src/fluttium_driver.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/fluttium_driver/lib/src/fluttium_driver.dart b/packages/fluttium_driver/lib/src/fluttium_driver.dart
index 0bf46393..72277531 100644
--- a/packages/fluttium_driver/lib/src/fluttium_driver.dart
+++ b/packages/fluttium_driver/lib/src/fluttium_driver.dart
@@ -371,6 +371,7 @@ class FluttiumDriver {
       if (configuration.deviceId != null) ...['-d', configuration.deviceId!],
       if (configuration.flavor != null) ...['--flavor', configuration.flavor!],
       ...configuration.dartDefines.expand((e) => ['--dart-define', e]),
+      --web-port=1337,
     ];
     _logger.detail('Running command: ${commandArgs.join(' ')}');
 

From 837dc06250610ccdec6fb394230de12f337c2693 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:04:56 +0100
Subject: [PATCH 02/19] Fix syntax

---
 packages/fluttium_driver/lib/src/fluttium_driver.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fluttium_driver/lib/src/fluttium_driver.dart b/packages/fluttium_driver/lib/src/fluttium_driver.dart
index 72277531..0fdc9e2c 100644
--- a/packages/fluttium_driver/lib/src/fluttium_driver.dart
+++ b/packages/fluttium_driver/lib/src/fluttium_driver.dart
@@ -371,7 +371,7 @@ class FluttiumDriver {
       if (configuration.deviceId != null) ...['-d', configuration.deviceId!],
       if (configuration.flavor != null) ...['--flavor', configuration.flavor!],
       ...configuration.dartDefines.expand((e) => ['--dart-define', e]),
-      --web-port=1337,
+      '--web-port=1337',
     ];
     _logger.detail('Running command: ${commandArgs.join(' ')}');
 

From 87d83f3dcaac3ab2f0f2373e35e743f7460dfaa9 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:10:13 +0100
Subject: [PATCH 03/19] Update syntax

---
 packages/fluttium_driver/lib/src/fluttium_driver.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fluttium_driver/lib/src/fluttium_driver.dart b/packages/fluttium_driver/lib/src/fluttium_driver.dart
index 0fdc9e2c..26c73550 100644
--- a/packages/fluttium_driver/lib/src/fluttium_driver.dart
+++ b/packages/fluttium_driver/lib/src/fluttium_driver.dart
@@ -371,7 +371,7 @@ class FluttiumDriver {
       if (configuration.deviceId != null) ...['-d', configuration.deviceId!],
       if (configuration.flavor != null) ...['--flavor', configuration.flavor!],
       ...configuration.dartDefines.expand((e) => ['--dart-define', e]),
-      '--web-port=1337',
+      ['--web-port', '1337'],
     ];
     _logger.detail('Running command: ${commandArgs.join(' ')}');
 

From e4618ab63c74757fadf29b526596dea8eb7b0ea7 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:12:19 +0100
Subject: [PATCH 04/19] Update syntax

---
 packages/fluttium_driver/lib/src/fluttium_driver.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fluttium_driver/lib/src/fluttium_driver.dart b/packages/fluttium_driver/lib/src/fluttium_driver.dart
index 26c73550..f707a3a8 100644
--- a/packages/fluttium_driver/lib/src/fluttium_driver.dart
+++ b/packages/fluttium_driver/lib/src/fluttium_driver.dart
@@ -371,7 +371,7 @@ class FluttiumDriver {
       if (configuration.deviceId != null) ...['-d', configuration.deviceId!],
       if (configuration.flavor != null) ...['--flavor', configuration.flavor!],
       ...configuration.dartDefines.expand((e) => ['--dart-define', e]),
-      ['--web-port', '1337'],
+      ...['--web-port', '1337'],
     ];
     _logger.detail('Running command: ${commandArgs.join(' ')}');
 

From 9f25bf3971c016e8ba79337260e8bb368c11071a Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:36:24 +0100
Subject: [PATCH 05/19] Change fluttium_driver import for fluttium_cli

---
 packages/fluttium_cli/pubspec.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/fluttium_cli/pubspec.yaml b/packages/fluttium_cli/pubspec.yaml
index 30e6471a..9f4fb3ba 100644
--- a/packages/fluttium_cli/pubspec.yaml
+++ b/packages/fluttium_cli/pubspec.yaml
@@ -13,7 +13,8 @@ dependencies:
   args: ^2.4.0
   cli_completion: ^0.3.0
   collection: ^1.17.1
-  fluttium_driver: ^0.1.3
+  fluttium_driver:
+    path: ../fluttium_driver
   fluttium_interfaces: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0

From 491c345f63a84fdbddd9402ab51a0070b8390eab Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 03:49:40 +0100
Subject: [PATCH 06/19] Add webPort to DriverConfiguration

---
 packages/fluttium_driver/lib/src/fluttium_driver.dart        | 5 ++++-
 .../lib/src/fluttium/driver_configuration.dart               | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/fluttium_driver/lib/src/fluttium_driver.dart b/packages/fluttium_driver/lib/src/fluttium_driver.dart
index f707a3a8..7b4a88b2 100644
--- a/packages/fluttium_driver/lib/src/fluttium_driver.dart
+++ b/packages/fluttium_driver/lib/src/fluttium_driver.dart
@@ -371,7 +371,10 @@ class FluttiumDriver {
       if (configuration.deviceId != null) ...['-d', configuration.deviceId!],
       if (configuration.flavor != null) ...['--flavor', configuration.flavor!],
       ...configuration.dartDefines.expand((e) => ['--dart-define', e]),
-      ...['--web-port', '1337'],
+      if (configuration.webPort != null) ...[
+        '--web-port',
+        configuration.webPort!
+      ],
     ];
     _logger.detail('Running command: ${commandArgs.join(' ')}');
 
diff --git a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
index 9ed84306..1b4acd8e 100644
--- a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
+++ b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
@@ -10,6 +10,7 @@ class DriverConfiguration extends Equatable {
     this.flavor,
     this.dartDefines = const [],
     this.deviceId,
+    this.webPort,
   });
 
   /// {@macro driver_configuration}
@@ -45,6 +46,9 @@ class DriverConfiguration extends Equatable {
   /// The device id to use for the driver.
   final String? deviceId;
 
+  /// The port to use for the web application.
+  final int? webPort;
+
   @override
   List<Object?> get props => [target, flavor, dartDefines, deviceId];
 

From a534fcdf33eb02a9a008cc25e409aa584046a447 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:01:48 +0100
Subject: [PATCH 07/19] Add property webPort to the DriverConfiguration

---
 .../lib/src/fluttium/driver_configuration.dart               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
index 1b4acd8e..2eeb81d9 100644
--- a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
+++ b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
@@ -27,6 +27,7 @@ class DriverConfiguration extends Equatable {
               [])
           .cast<String>(),
       deviceId: json['deviceId']?.toString(),
+      webPort: json['webPort'] as int?,
     );
   }
 
@@ -50,7 +51,7 @@ class DriverConfiguration extends Equatable {
   final int? webPort;
 
   @override
-  List<Object?> get props => [target, flavor, dartDefines, deviceId];
+  List<Object?> get props => [target, flavor, dartDefines, deviceId, webPort];
 
   /// Copy the configuration to a new instance with optional overrides.
   DriverConfiguration copyWith({
@@ -59,12 +60,14 @@ class DriverConfiguration extends Equatable {
     @Deprecated('Use `target` instead') String? mainEntry,
     String? flavor,
     List<String>? dartDefines,
+    int? webPort,
   }) {
     return DriverConfiguration(
       deviceId: deviceId ?? this.deviceId,
       target: target ?? mainEntry ?? this.target,
       flavor: flavor ?? this.flavor,
       dartDefines: dartDefines ?? this.dartDefines,
+      webPort: webPort ?? this.webPort,
     );
   }
 }

From d171a6ce7b5f43199836ffb7896ff5a16fe7ccee Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:02:02 +0100
Subject: [PATCH 08/19] Add webPort as extra flag to the test command, and
 parse it

---
 .../lib/src/commands/test_command/test_command.dart  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
index 6c4d03bf..4c97b529 100644
--- a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
+++ b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
@@ -96,6 +96,12 @@ Multiple defines can be passed by repeating "--dart-define" multiple times.''',
           'compact': 'A single line that updates dynamically.',
           'pretty': 'A nicely formatted output that works nicely with --watch.',
         },
+      )
+      ..addOption(
+        'web-port',
+        abbr: 'port',
+        help:
+            '''The port number for serving the web application. Must be between 1024 and 65535. Defaults to null if not provided.''',
       );
   }
 
@@ -310,6 +316,12 @@ Either adjust the constraint in the Fluttium configuration or update the CLI to
       return ExitCode.unavailable.code;
     }
 
+    if (fluttium.driver.webPort != null) {
+      fluttium = fluttium.copyWith(
+        driver: fluttium.driver.copyWith(webPort: results['web-port'] as int?),
+      );
+    }
+
     final driver = _driver(
       configuration: fluttium.driver,
       actions: fluttium.actions,

From 5ae12c14990809530a914e4eee022911c5f61113 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:03:52 +0100
Subject: [PATCH 09/19] Update import of changed fluttium_interfaces

---
 packages/fluttium_cli/pubspec.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/fluttium_cli/pubspec.yaml b/packages/fluttium_cli/pubspec.yaml
index 9f4fb3ba..98cbc705 100644
--- a/packages/fluttium_cli/pubspec.yaml
+++ b/packages/fluttium_cli/pubspec.yaml
@@ -15,7 +15,8 @@ dependencies:
   collection: ^1.17.1
   fluttium_driver:
     path: ../fluttium_driver
-  fluttium_interfaces: ^0.1.0
+  fluttium_interfaces:
+    path: ../fluttium_interfaces
   mason: ^0.1.0-dev.50
   meta: ^1.8.0
   path: ^1.8.3

From dd2561acdbf3380713f91500afe1741ad46d9902 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:05:01 +0100
Subject: [PATCH 10/19] Update import of fluttium_interfaces for
 fluttium_driver

---
 packages/fluttium_driver/pubspec.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/fluttium_driver/pubspec.yaml b/packages/fluttium_driver/pubspec.yaml
index 1c9f94ff..9f7c8780 100644
--- a/packages/fluttium_driver/pubspec.yaml
+++ b/packages/fluttium_driver/pubspec.yaml
@@ -11,7 +11,8 @@ environment:
 
 dependencies:
   equatable: ^2.0.5
-  fluttium_interfaces: ^0.1.0
+  fluttium_interfaces:
+    path: ../fluttium_interfaces
   fluttium_protocol: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0

From fc552797211e143bb6520c6d2940cf6f13fdadaa Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:06:52 +0100
Subject: [PATCH 11/19] Remove abbrevation which needs to be max. 1 character

---
 .../fluttium_cli/lib/src/commands/test_command/test_command.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
index 4c97b529..1040db9c 100644
--- a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
+++ b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
@@ -99,7 +99,6 @@ Multiple defines can be passed by repeating "--dart-define" multiple times.''',
       )
       ..addOption(
         'web-port',
-        abbr: 'port',
         help:
             '''The port number for serving the web application. Must be between 1024 and 65535. Defaults to null if not provided.''',
       );

From 36c560a295f6a7f1d9de8cbd42b6861b186538d9 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:12:11 +0100
Subject: [PATCH 12/19] Fix parsing of web-port

---
 .../lib/src/commands/test_command/test_command.dart      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
index 1040db9c..36f4ba60 100644
--- a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
+++ b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
@@ -133,6 +133,8 @@ Multiple defines can be passed by repeating "--dart-define" multiple times.''',
 
   List<String> get _dartDefines => results['dart-define'] as List<String>;
 
+  int? get _webPort => results['web-port'] as int?;
+
   /// The file of the flow to run.
   File get _userFlowFile {
     if (results.rest.isEmpty || results.rest.first.isEmpty) {
@@ -299,6 +301,7 @@ Either adjust the constraint in the Fluttium configuration or update the CLI to
         flavor: _flavor,
         dartDefines: [...fluttium.driver.dartDefines, ..._dartDefines],
         deviceId: results['device-id'] as String?,
+        webPort: _webPort,
       ),
     );
 
@@ -315,12 +318,6 @@ Either adjust the constraint in the Fluttium configuration or update the CLI to
       return ExitCode.unavailable.code;
     }
 
-    if (fluttium.driver.webPort != null) {
-      fluttium = fluttium.copyWith(
-        driver: fluttium.driver.copyWith(webPort: results['web-port'] as int?),
-      );
-    }
-
     final driver = _driver(
       configuration: fluttium.driver,
       actions: fluttium.actions,

From 63326d696358ee88484f4b8274cc740c678da138 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:15:23 +0100
Subject: [PATCH 13/19] Fix property type

---
 .../lib/src/commands/test_command/test_command.dart             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
index 36f4ba60..da94959e 100644
--- a/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
+++ b/packages/fluttium_cli/lib/src/commands/test_command/test_command.dart
@@ -133,7 +133,7 @@ Multiple defines can be passed by repeating "--dart-define" multiple times.''',
 
   List<String> get _dartDefines => results['dart-define'] as List<String>;
 
-  int? get _webPort => results['web-port'] as int?;
+  String? get _webPort => results['web-port'] as String?;
 
   /// The file of the flow to run.
   File get _userFlowFile {

From 96f764798b871ac21433987dac03fc9e90413a70 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 04:16:30 +0100
Subject: [PATCH 14/19] Fix property type

---
 .../lib/src/fluttium/driver_configuration.dart              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
index 2eeb81d9..3df90659 100644
--- a/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
+++ b/packages/fluttium_interfaces/lib/src/fluttium/driver_configuration.dart
@@ -27,7 +27,7 @@ class DriverConfiguration extends Equatable {
               [])
           .cast<String>(),
       deviceId: json['deviceId']?.toString(),
-      webPort: json['webPort'] as int?,
+      webPort: json['webPort'] as String?,
     );
   }
 
@@ -48,7 +48,7 @@ class DriverConfiguration extends Equatable {
   final String? deviceId;
 
   /// The port to use for the web application.
-  final int? webPort;
+  final String? webPort;
 
   @override
   List<Object?> get props => [target, flavor, dartDefines, deviceId, webPort];
@@ -60,7 +60,7 @@ class DriverConfiguration extends Equatable {
     @Deprecated('Use `target` instead') String? mainEntry,
     String? flavor,
     List<String>? dartDefines,
-    int? webPort,
+    String? webPort,
   }) {
     return DriverConfiguration(
       deviceId: deviceId ?? this.deviceId,

From ee963406b8ccad6a4845bfcb85e68a1b60ac4dc0 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:16:19 +0100
Subject: [PATCH 15/19] Revert changing imports

---
 packages/fluttium_cli/pubspec.yaml    | 6 ++----
 packages/fluttium_driver/pubspec.yaml | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/fluttium_cli/pubspec.yaml b/packages/fluttium_cli/pubspec.yaml
index 98cbc705..30e6471a 100644
--- a/packages/fluttium_cli/pubspec.yaml
+++ b/packages/fluttium_cli/pubspec.yaml
@@ -13,10 +13,8 @@ dependencies:
   args: ^2.4.0
   cli_completion: ^0.3.0
   collection: ^1.17.1
-  fluttium_driver:
-    path: ../fluttium_driver
-  fluttium_interfaces:
-    path: ../fluttium_interfaces
+  fluttium_driver: ^0.1.3
+  fluttium_interfaces: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0
   path: ^1.8.3
diff --git a/packages/fluttium_driver/pubspec.yaml b/packages/fluttium_driver/pubspec.yaml
index 9f7c8780..1c9f94ff 100644
--- a/packages/fluttium_driver/pubspec.yaml
+++ b/packages/fluttium_driver/pubspec.yaml
@@ -11,8 +11,7 @@ environment:
 
 dependencies:
   equatable: ^2.0.5
-  fluttium_interfaces:
-    path: ../fluttium_interfaces
+  fluttium_interfaces: ^0.1.0
   fluttium_protocol: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0

From 163011d7fc5c6371acb4b375fbb0b32f3523f089 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:27:58 +0100
Subject: [PATCH 16/19] Revert "Revert changing imports"

This reverts commit ee963406b8ccad6a4845bfcb85e68a1b60ac4dc0.
---
 packages/fluttium_cli/pubspec.yaml    | 6 ++++--
 packages/fluttium_driver/pubspec.yaml | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/fluttium_cli/pubspec.yaml b/packages/fluttium_cli/pubspec.yaml
index 30e6471a..98cbc705 100644
--- a/packages/fluttium_cli/pubspec.yaml
+++ b/packages/fluttium_cli/pubspec.yaml
@@ -13,8 +13,10 @@ dependencies:
   args: ^2.4.0
   cli_completion: ^0.3.0
   collection: ^1.17.1
-  fluttium_driver: ^0.1.3
-  fluttium_interfaces: ^0.1.0
+  fluttium_driver:
+    path: ../fluttium_driver
+  fluttium_interfaces:
+    path: ../fluttium_interfaces
   mason: ^0.1.0-dev.50
   meta: ^1.8.0
   path: ^1.8.3
diff --git a/packages/fluttium_driver/pubspec.yaml b/packages/fluttium_driver/pubspec.yaml
index 1c9f94ff..9f7c8780 100644
--- a/packages/fluttium_driver/pubspec.yaml
+++ b/packages/fluttium_driver/pubspec.yaml
@@ -11,7 +11,8 @@ environment:
 
 dependencies:
   equatable: ^2.0.5
-  fluttium_interfaces: ^0.1.0
+  fluttium_interfaces:
+    path: ../fluttium_interfaces
   fluttium_protocol: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0

From ed640c3d352ce5c053749aed50cdd21816ed65d8 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:24:16 +0100
Subject: [PATCH 17/19] Reapply "Revert changing imports"

This reverts commit 163011d7fc5c6371acb4b375fbb0b32f3523f089.
---
 packages/fluttium_cli/pubspec.yaml    | 6 ++----
 packages/fluttium_driver/pubspec.yaml | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/fluttium_cli/pubspec.yaml b/packages/fluttium_cli/pubspec.yaml
index 98cbc705..30e6471a 100644
--- a/packages/fluttium_cli/pubspec.yaml
+++ b/packages/fluttium_cli/pubspec.yaml
@@ -13,10 +13,8 @@ dependencies:
   args: ^2.4.0
   cli_completion: ^0.3.0
   collection: ^1.17.1
-  fluttium_driver:
-    path: ../fluttium_driver
-  fluttium_interfaces:
-    path: ../fluttium_interfaces
+  fluttium_driver: ^0.1.3
+  fluttium_interfaces: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0
   path: ^1.8.3
diff --git a/packages/fluttium_driver/pubspec.yaml b/packages/fluttium_driver/pubspec.yaml
index 9f7c8780..1c9f94ff 100644
--- a/packages/fluttium_driver/pubspec.yaml
+++ b/packages/fluttium_driver/pubspec.yaml
@@ -11,8 +11,7 @@ environment:
 
 dependencies:
   equatable: ^2.0.5
-  fluttium_interfaces:
-    path: ../fluttium_interfaces
+  fluttium_interfaces: ^0.1.0
   fluttium_protocol: ^0.1.0
   mason: ^0.1.0-dev.50
   meta: ^1.8.0

From 7362b6e0ed1667e377c36e9fde1c488af2c9cf54 Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:42:55 +0100
Subject: [PATCH 18/19] Add missing trailing commas (fix checks)

---
 .../fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart     | 2 +-
 .../fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart   | 2 +-
 .../test/src/fluttium/action_location_test.dart                 | 2 +-
 .../test/src/user_flow/user_flow_step_test.dart                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart b/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
index f3a75666..a955ec9b 100644
--- a/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
+++ b/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
@@ -31,7 +31,7 @@ class FluttiumYaml extends Equatable {
       actions: {
         for (final entry
             in (yaml['actions'] as Map<String, dynamic>? ?? {}).entries)
-          entry.key: ActionLocation.fromJson(entry.value)
+          entry.key: ActionLocation.fromJson(entry.value),
       },
       driver: DriverConfiguration.fromJson(
         yaml['driver'] as Map<String, dynamic>? ?? {},
diff --git a/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart b/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
index 697e15f1..5f4ec30b 100644
--- a/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
+++ b/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
@@ -28,7 +28,7 @@ class UserFlowYaml extends Equatable {
       description: metaData['description'] as String? ?? '',
       steps: [
         for (final step in stepData.cast<Map<String, dynamic>>())
-          UserFlowStep.fromJson(step)
+          UserFlowStep.fromJson(step),
       ],
     );
   }
diff --git a/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart b/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
index 0ca7da43..cc091883 100644
--- a/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
+++ b/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
@@ -66,7 +66,7 @@ void main() {
             'url': 'git@git.some.where/some/action.git',
             'ref': 'main',
             'path': 'some/path',
-          }
+          },
         });
 
         expect(location.hosted, isNull);
diff --git a/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart b/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
index 49cd71c0..9cd1ef48 100644
--- a/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
+++ b/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
@@ -19,7 +19,7 @@ void main() {
       final step = UserFlowStep.fromJson(const {
         'expectVisible': {
           'text': 'findByText',
-        }
+        },
       });
 
       expect(step.actionName, equals('expectVisible'));

From eddfe796cbc8d08996d679be128c013edf34433f Mon Sep 17 00:00:00 2001
From: Joachim Nohl <43643339+nohli@users.noreply.github.com>
Date: Wed, 11 Sep 2024 08:46:12 +0100
Subject: [PATCH 19/19] Revert "Add missing trailing commas (fix checks)"

This reverts commit 7362b6e0ed1667e377c36e9fde1c488af2c9cf54.
---
 .../fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart     | 2 +-
 .../fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart   | 2 +-
 .../test/src/fluttium/action_location_test.dart                 | 2 +-
 .../test/src/user_flow/user_flow_step_test.dart                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart b/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
index a955ec9b..f3a75666 100644
--- a/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
+++ b/packages/fluttium_interfaces/lib/src/fluttium/fluttium_yaml.dart
@@ -31,7 +31,7 @@ class FluttiumYaml extends Equatable {
       actions: {
         for (final entry
             in (yaml['actions'] as Map<String, dynamic>? ?? {}).entries)
-          entry.key: ActionLocation.fromJson(entry.value),
+          entry.key: ActionLocation.fromJson(entry.value)
       },
       driver: DriverConfiguration.fromJson(
         yaml['driver'] as Map<String, dynamic>? ?? {},
diff --git a/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart b/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
index 5f4ec30b..697e15f1 100644
--- a/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
+++ b/packages/fluttium_interfaces/lib/src/user_flow/user_flow_yaml.dart
@@ -28,7 +28,7 @@ class UserFlowYaml extends Equatable {
       description: metaData['description'] as String? ?? '',
       steps: [
         for (final step in stepData.cast<Map<String, dynamic>>())
-          UserFlowStep.fromJson(step),
+          UserFlowStep.fromJson(step)
       ],
     );
   }
diff --git a/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart b/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
index cc091883..0ca7da43 100644
--- a/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
+++ b/packages/fluttium_interfaces/test/src/fluttium/action_location_test.dart
@@ -66,7 +66,7 @@ void main() {
             'url': 'git@git.some.where/some/action.git',
             'ref': 'main',
             'path': 'some/path',
-          },
+          }
         });
 
         expect(location.hosted, isNull);
diff --git a/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart b/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
index 9cd1ef48..49cd71c0 100644
--- a/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
+++ b/packages/fluttium_interfaces/test/src/user_flow/user_flow_step_test.dart
@@ -19,7 +19,7 @@ void main() {
       final step = UserFlowStep.fromJson(const {
         'expectVisible': {
           'text': 'findByText',
-        },
+        }
       });
 
       expect(step.actionName, equals('expectVisible'));