From 8903912f33cbb2a18e389e33b326b2ebbe226660 Mon Sep 17 00:00:00 2001
From: Joonas Kerttula <joonas.kerttula@codemate.com>
Date: Tue, 4 Jun 2024 18:06:02 +0300
Subject: [PATCH] chore: update patrol and minimum SDK version to Flutter
 3.22.1/Dart 3.4 (#92)

* upgrades the version to 0.2.3-beta
* chore: updated minimum supported SDK version to Flutter 3.22.1/Dart 3.4 and Patrol
---
 .github/workflows/analyze.yaml                |  4 ++--
 .github/workflows/build.yaml                  | 10 +++++-----
 .github/workflows/integration_tests.yaml      |  8 ++++----
 .github/workflows/licence-check.yaml          |  2 +-
 CHANGELOG.md                                  |  7 +++++++
 CONTRIBUTING.md                               |  2 +-
 .../android/app/src/main/AndroidManifest.xml  | 14 +++++++------
 example/integration_test/t06_map_test.dart    |  8 ++++----
 .../t07_event_listener_test.dart              |  7 -------
 example/lib/pages/camera.dart                 |  2 +-
 example/pubspec.yaml                          |  6 +++---
 lib/src/google_maps_navigation.dart           | 20 +++++++++----------
 pubspec.yaml                                  |  6 +++---
 13 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/analyze.yaml b/.github/workflows/analyze.yaml
index a5cfeef..d497552 100644
--- a/.github/workflows/analyze.yaml
+++ b/.github/workflows/analyze.yaml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
@@ -51,7 +51,7 @@ jobs:
           java-version: "17"
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 724e156..6ca117a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,7 +37,7 @@ jobs:
           cache: "gradle"
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
@@ -59,7 +59,7 @@ jobs:
           cache: "gradle"
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
@@ -85,7 +85,7 @@ jobs:
             ${{ runner.os }}-pods-
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
@@ -114,7 +114,7 @@ jobs:
           cache: "gradle"
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: bluefireteam/melos-action@6085791af7036f6366c9a4b9d55105c0ef9c6388
@@ -134,7 +134,7 @@ jobs:
       - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
           architecture: x64
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
index 40b717a..a09ac2a 100644
--- a/.github/workflows/integration_tests.yaml
+++ b/.github/workflows/integration_tests.yaml
@@ -29,7 +29,7 @@ jobs:
     timeout-minutes: 45
     strategy:
       matrix:
-        patrol_cli_version: [2.5.0]
+        patrol_cli_version: [2.7.0]
         working_directory: ["example"]
     runs-on:
       labels: ubuntu-latest-8core
@@ -64,7 +64,7 @@ jobs:
           key: avd
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - name: Install patrol_cli
@@ -104,7 +104,7 @@ jobs:
     timeout-minutes: 90
     strategy:
       matrix:
-        patrol_cli_version: [2.5.0]
+        patrol_cli_version: [2.7.0]
         working_directory: ["example"]
     runs-on:
       labels: macos-13-large
@@ -119,7 +119,7 @@ jobs:
       - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
       - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - uses: actions/cache@v4
diff --git a/.github/workflows/licence-check.yaml b/.github/workflows/licence-check.yaml
index c29a8b9..c113559 100644
--- a/.github/workflows/licence-check.yaml
+++ b/.github/workflows/licence-check.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Install Flutter
         uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
         with:
-          flutter-version: "3.19.x"
+          flutter-version: "3.22.x"
           channel: "stable"
           cache: true
       - name: Install Melos
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61b616a..1c7c226 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.2.3-beta
+
+This is the beta release of the Google Maps Navigation package for Flutter. It is an early look at the package and is intended for testing and feedback collection. The functionalities and APIs in this version are subject to change.
+
+- Updates minimum supported SDK version to Flutter 3.22.1/Dart 3.4.
+- Update patrol version to 3.7.2
+
 ## 0.2.2-beta
 
 This is the beta release of the Google Maps Navigation package for Flutter. It is an early look at the package and is intended for testing and feedback collection. The functionalities and APIs in this version are subject to change.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 09feb0c..f34952f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -132,7 +132,7 @@ Specify the device you want to run the tests on with the DEVICE env variable.
 Integration tests are responsible for ensuring that the plugin works against the native Navigation SDK for both Android and iOS platforms. Patrol is used for the integration tests to simplify interactions with native elements. To use patrol, you first need to activate the patrol_cli.  
 
 ```bash
-flutter pub global activate patrol_cli 2.5.0
+flutter pub global activate patrol_cli 2.7.0
 ```
 
 To ensure that all necessary dependencies for patrol are properly set up, run the following command:
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index a43566e..de3068c 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -15,8 +15,10 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <application
         android:label="google_maps_navigation_example"
         android:icon="@mipmap/ic_launcher">
@@ -36,12 +38,12 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/example/integration_test/t06_map_test.dart b/example/integration_test/t06_map_test.dart
index 6a76bb5..72a51ad 100644
--- a/example/integration_test/t06_map_test.dart
+++ b/example/integration_test/t06_map_test.dart
@@ -98,12 +98,12 @@ void main() {
       debugPrint('My location button clicked event: currently $event');
     }
 
-    /// The evot tested because there's no reliable way to trigger them currently.
+    /// The events are not tested because there's no reliable way to trigger them currently.
     void onMyLocationClicked(MyLocationClickedEvent event) {
       debugPrint('My location clicked event: currently $event');
     }
 
-    /// The evot tested because there's no reliable way to trigger them currently.
+    /// The events are not tested because there's no reliable way to trigger them currently.
     void onMapLongClicked(LatLng coordinates) {
       debugPrint(
           'Map clicked event lat: ${coordinates.latitude}, lng: ${coordinates.longitude}.');
@@ -118,14 +118,14 @@ void main() {
       initializeNavigation: false,
       onMapClicked: expectAsync1((LatLng msg) {
         expectSync(msg, isA<LatLng>());
-      }, count: 1, max: 1),
+      }, max: 1),
       onMapLongClicked: onMapLongClicked,
       onMyLocationButtonClicked: onMyLocationButtonClicked,
       onMyLocationClicked: onMyLocationClicked,
     );
 
     /// Test that the onMapClicked event comes in.
-    await $.native.tap(Selector(enabled: true));
+    await $.native.tapAt(const Offset(0.5, 0.5));
 
     /// Test the default values match with what has been documented in the
     /// API documentation in google_maps_navigation.dart file.
diff --git a/example/integration_test/t07_event_listener_test.dart b/example/integration_test/t07_event_listener_test.dart
index 00a25cd..bfad6f4 100644
--- a/example/integration_test/t07_event_listener_test.dart
+++ b/example/integration_test/t07_event_listener_test.dart
@@ -47,7 +47,6 @@ void main() {
           eventReceived.complete();
         }
       },
-      count: 1,
       max: -1,
     ));
     await $.pumpAndSettle();
@@ -109,7 +108,6 @@ void main() {
           eventReceived.complete();
         }
       },
-      count: 1,
       max: -1,
     ));
     await $.pumpAndSettle();
@@ -173,7 +171,6 @@ void main() {
                   eventReceived.complete();
                 }
               },
-              count: 1,
               max: -1,
             ),
             numNextStepsToPreview: 1);
@@ -232,7 +229,6 @@ void main() {
           eventReceived.complete();
         }
       },
-      count: 1,
       max: -1,
     ));
     await $.pumpAndSettle();
@@ -321,7 +317,6 @@ void main() {
           eventReceived.complete();
         }
       },
-      count: 1,
       max: -1,
     ));
 
@@ -365,7 +360,6 @@ void main() {
           eventReceived.complete();
         }
       },
-      count: 1,
       max: -1,
     ));
 
@@ -439,7 +433,6 @@ void main() {
             eventReceived.complete();
           }
         },
-        count: 1,
         max: -1,
       ));
       await $.pumpAndSettle();
diff --git a/example/lib/pages/camera.dart b/example/lib/pages/camera.dart
index a0877a0..3ecc73f 100644
--- a/example/lib/pages/camera.dart
+++ b/example/lib/pages/camera.dart
@@ -244,7 +244,7 @@ class _CameraPageState extends ExamplePageState<CameraPage> {
         .elevatedButtonTheme
         .style!
         .copyWith(
-            minimumSize: MaterialStateProperty.all<Size>(const Size(107, 36)));
+            minimumSize: WidgetStateProperty.all<Size>(const Size(107, 36)));
 
     return Column(
       mainAxisSize: MainAxisSize.min,
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index ff9d520..108697a 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -17,7 +17,7 @@ description: Demonstrates how to use the google_maps_navigation plugin.
 publish_to: "none"
 
 environment:
-  sdk: ">=3.1.0 <4.0.0"
+  sdk: ^3.4.0
 
 dependencies:
   cupertino_icons: ^1.0.2
@@ -35,9 +35,9 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  patrol: ">=3.3.0 <3.4.0"
-  patrol_finders: "<2.1.0"
+  patrol: ^3.7.2
   pub_semver: ^2.1.4
+  test_api: any
 
 flutter:
   uses-material-design: true
diff --git a/lib/src/google_maps_navigation.dart b/lib/src/google_maps_navigation.dart
index 8cf8c63..304749c 100644
--- a/lib/src/google_maps_navigation.dart
+++ b/lib/src/google_maps_navigation.dart
@@ -666,18 +666,18 @@ class GoogleNavigationViewController {
   /// Sets the event channel listener for the map click event listeners.
   void _setOnMapClickedListeners() {
     if (_viewState != null) {
-      if (_viewState?.widget.onMapClicked != null) {
+      if (_viewState.widget.onMapClicked != null) {
         GoogleMapsNavigationPlatform.instance
             .getMapClickEventStream(viewId: _viewId)
             .listen((MapClickEvent event) {
-          _viewState!.widget.onMapClicked!(event.target);
+          _viewState.widget.onMapClicked!(event.target);
         });
       }
-      if (_viewState?.widget.onMapLongClicked != null) {
+      if (_viewState.widget.onMapLongClicked != null) {
         GoogleMapsNavigationPlatform.instance
             .getMapLongClickEventStream(viewId: _viewId)
             .listen((MapLongClickEvent event) {
-          _viewState!.widget.onMapLongClicked!(event.target);
+          _viewState.widget.onMapLongClicked!(event.target);
         });
       }
     }
@@ -686,10 +686,10 @@ class GoogleNavigationViewController {
   /// Sets the event channel listener for the on recenter button clicked event.
   void _setOnRecenterButtonClickedListener() {
     if (_viewState != null &&
-        _viewState?.widget.onRecenterButtonClicked != null) {
+        _viewState.widget.onRecenterButtonClicked != null) {
       GoogleMapsNavigationPlatform.instance
           .getNavigationRecenterButtonClickedEventStream(viewId: _viewId)
-          .listen(_viewState?.widget.onRecenterButtonClicked);
+          .listen(_viewState.widget.onRecenterButtonClicked);
     }
   }
 
@@ -714,20 +714,20 @@ class GoogleNavigationViewController {
 
   /// Sets the event channel listener for the on my location clicked event.
   void _setOnMyLocationClickedListener() {
-    if (_viewState != null && _viewState?.widget.onMyLocationClicked != null) {
+    if (_viewState != null && _viewState.widget.onMyLocationClicked != null) {
       GoogleMapsNavigationPlatform.instance
           .getMyLocationClickedEventStream(viewId: _viewId)
-          .listen(_viewState?.widget.onMyLocationClicked);
+          .listen(_viewState.widget.onMyLocationClicked);
     }
   }
 
   /// Sets the event channel listener for the on my location button clicked event.
   void _setOnMyLocationButtonClickedListener() {
     if (_viewState != null &&
-        _viewState?.widget.onMyLocationButtonClicked != null) {
+        _viewState.widget.onMyLocationButtonClicked != null) {
       GoogleMapsNavigationPlatform.instance
           .getMyLocationButtonClickedEventStream(viewId: _viewId)
-          .listen(_viewState?.widget.onMyLocationButtonClicked);
+          .listen(_viewState.widget.onMyLocationButtonClicked);
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index fb02f7e..5474603 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,12 +16,12 @@ name: google_maps_navigation
 description: A Google Maps Navigation plugin
 repository: https://github.com/googlemaps/flutter-navigation-sdk
 issue_tracker: https://github.com/googlemaps/flutter-navigation-sdk/issues
-version: 0.2.2-beta
+version: 0.2.3-beta
 publish_to: none
 
 environment:
-  sdk: ">=3.1.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: ^3.4.0
+  flutter: ">=3.22.1"
 
 dependencies:
   collection: ^1.17.2