diff --git a/.github/workflows/geolocator.yaml b/.github/workflows/geolocator.yaml
index 9e06a30e..3ac3bfca 100644
--- a/.github/workflows/geolocator.yaml
+++ b/.github/workflows/geolocator.yaml
@@ -33,11 +33,11 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
-      # Ensures JAVA 11 is installed on the build agent.
+      # Ensures JAVA 17 is installed on the build agent.
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       
       # Make sure the stable version of Flutter is available
       - uses: subosito/flutter-action@v2
@@ -49,8 +49,8 @@ jobs:
         run: flutter pub get
         working-directory: ${{env.source-directory}}
 
-      # Run Flutter Format to ensure formatting is valid
-      - name: Run Flutter Format
+      # Run Dart Format to ensure formatting is valid
+      - name: Run Dart Format
         run: dart format --set-exit-if-changed .
         working-directory: ${{env.source-directory}}
      
diff --git a/.github/workflows/geolocator_android.yaml b/.github/workflows/geolocator_android.yaml
index 0aa16c1b..2a51b467 100644
--- a/.github/workflows/geolocator_android.yaml
+++ b/.github/workflows/geolocator_android.yaml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       # Make sure the stable version of Flutter is available
       - uses: subosito/flutter-action@v2
diff --git a/.gitignore b/.gitignore
index e99d3e1a..20373d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ unlinked.ds
 unlinked_spec.ds
 flutter_export_environment.sh
 **/.flutter-plugins-dependencies
+**/Flutter/ephemeral/
 
 # Android related
 gradle-wrapper.jar
@@ -95,6 +96,8 @@ GeneratedPluginRegistrant.java
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 **/ios/Flutter/Flutter.podspec
+**/.build/
+**/.swiftpm/
 
 # Firebase related
 .firebase/
diff --git a/geolocator/CHANGELOG.md b/geolocator/CHANGELOG.md
index b7ecf283..71a4f92e 100644
--- a/geolocator/CHANGELOG.md
+++ b/geolocator/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 13.0.4
+
+- Bump `flutter_lints` to version 5.0.0
+
+## 13.0.3
+
+- Updates dart sdk to `sdk: ^3.5.0`
+- Updates example project and fixes analyzer issues
+
+## 13.0.2
+
+- Updates dependency on geolocator_apple to version 2.3.8.
+- Migrates Android configuration of example app away from imperative gradle API.
+
 ## 13.0.1
 
 - Resolves problems when compiling non-web platforms because of illegal reference to `dart:js_interop`.
diff --git a/geolocator/README.md b/geolocator/README.md
index f1eaef8e..d703b5dd 100644
--- a/geolocator/README.md
+++ b/geolocator/README.md
@@ -42,11 +42,11 @@ The TL;DR version is:
 android.useAndroidX=true
 android.enableJetifier=true
 ```
-2. Make sure you set the `compileSdkVersion` in your "android/app/build.gradle" file to 34:
+2. Make sure you set the `compileSdkVersion` in your "android/app/build.gradle" file to 35:
 
 ```
 android {
-  compileSdkVersion 34
+  compileSdkVersion 35
 
   ...
 }
diff --git a/geolocator/example/android/app/build.gradle b/geolocator/example/android/app/build.gradle
index 91cfad65..870f1d3f 100644
--- a/geolocator/example/android/app/build.gradle
+++ b/geolocator/example/android/app/build.gradle
@@ -1,3 +1,8 @@
+plugins {
+    id "com.android.application"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -27,18 +27,15 @@ project.getTasks().withType(JavaCompile) {
     options.compilerArgs.addAll(args)
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 33
+    compileSdkVersion flutter.compileSdkVersion
 
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.baseflow.geolocator_example"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/geolocator/example/android/app/src/main/AndroidManifest.xml b/geolocator/example/android/app/src/main/AndroidManifest.xml
index 829fcb8c..3e48a8e8 100644
--- a/geolocator/example/android/app/src/main/AndroidManifest.xml
+++ b/geolocator/example/android/app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/geolocator/example/android/build.gradle b/geolocator/example/android/build.gradle
index e29a4431..bc157bd1 100644
--- a/geolocator/example/android/build.gradle
+++ b/geolocator/example/android/build.gradle
@@ -1,14 +1,3 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -24,6 +13,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/geolocator/example/android/gradle/wrapper/gradle-wrapper.properties b/geolocator/example/android/gradle/wrapper/gradle-wrapper.properties
index e88a9f9d..8416858f 100644
--- a/geolocator/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/geolocator/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/geolocator/example/android/settings.gradle b/geolocator/example/android/settings.gradle
index 5a2f14fb..56eb85cb 100644
--- a/geolocator/example/android/settings.gradle
+++ b/geolocator/example/android/settings.gradle
@@ -1,15 +1,24 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.7.0" apply false
 }
+
+include ":app"
\ No newline at end of file
diff --git a/geolocator/example/ios/Flutter/AppFrameworkInfo.plist b/geolocator/example/ios/Flutter/AppFrameworkInfo.plist
index 6b4c0f78..4f8d4d24 100644
--- a/geolocator/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/geolocator/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/geolocator/example/ios/Runner.xcodeproj/project.pbxproj b/geolocator/example/ios/Runner.xcodeproj/project.pbxproj
index 36aa7366..19138798 100644
--- a/geolocator/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/geolocator/example/ios/Runner.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -353,6 +353,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -414,7 +415,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -463,7 +464,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -485,6 +486,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -511,6 +513,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/geolocator/example/lib/main.dart b/geolocator/example/lib/main.dart
index a2633dcc..5f4ec440 100644
--- a/geolocator/example/lib/main.dart
+++ b/geolocator/example/lib/main.dart
@@ -17,7 +17,7 @@ void main() {
 /// Example [Widget] showing the functionalities of the geolocator plugin
 class GeolocatorWidget extends StatefulWidget {
   /// Creates a new GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  const GeolocatorWidget({super.key});
 
   /// Utility method to create a page with the Baseflow templating.
   static ExamplePage createPage() {
diff --git a/geolocator/example/pubspec.yaml b/geolocator/example/pubspec.yaml
index b5fc7b89..fc250984 100644
--- a/geolocator/example/pubspec.yaml
+++ b/geolocator/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the geolocator plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
@@ -33,7 +33,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.1
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/geolocator/pubspec.yaml b/geolocator/pubspec.yaml
index edebb745..f3052388 100644
--- a/geolocator/pubspec.yaml
+++ b/geolocator/pubspec.yaml
@@ -2,10 +2,10 @@ name: geolocator
 description: Geolocation plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API for generic location (GPS etc.) functions.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 13.0.1
+version: 13.0.4
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
+  sdk: ^3.5.0
   flutter: ">=2.8.0"
 
 flutter:
@@ -28,7 +28,7 @@ dependencies:
 
   geolocator_platform_interface: ^4.2.3
   geolocator_android: ^4.6.0
-  geolocator_apple: ^2.3.7
+  geolocator_apple: ^2.3.8
   geolocator_web: ^4.1.1
   geolocator_windows: ^0.2.3
 
diff --git a/geolocator_android/CHANGELOG.md b/geolocator_android/CHANGELOG.md
index b0e5ab35..8885c760 100644
--- a/geolocator_android/CHANGELOG.md
+++ b/geolocator_android/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 5.0.1
+
+- Bump `flutter_lints` to version 5.0.0
+
+## 5.0.0
+
+- **BREAKING CHANGE:** for Flutter `3.27.0` and below. Make sure you'll upgrade Flutter to `3.29.0` or above before using this version.
+* Fixes deprecation warnings
+
+## 4.6.2
+
+* Updates compileSDKVersion to 35
+* Updates Fixed warnings in Android package and Android example project
+* Updates gradle version
+* Updates com.android.application version to 8.7.0
+
 ## 4.6.1
 
 * Fixes a bug where the plugin throws an exception while requesting locations updates with coarse location permission only.
diff --git a/geolocator_android/android/build.gradle b/geolocator_android/android/build.gradle
index 928c59da..1659b851 100644
--- a/geolocator_android/android/build.gradle
+++ b/geolocator_android/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -26,10 +26,10 @@ android {
         namespace("com.baseflow.geolocator")
     }
 
-    compileSdk 34
+    compileSdk flutter.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/geolocator_android/example/android/app/build.gradle b/geolocator_android/example/android/app/build.gradle
index 7eeb09b5..d662262f 100644
--- a/geolocator_android/example/android/app/build.gradle
+++ b/geolocator_android/example/android/app/build.gradle
@@ -32,8 +32,8 @@ android {
     compileSdkVersion flutter.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     lintOptions {
diff --git a/geolocator_android/example/android/gradle/wrapper/gradle-wrapper.properties b/geolocator_android/example/android/gradle/wrapper/gradle-wrapper.properties
index b4ab7d88..4ef267ae 100644
--- a/geolocator_android/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/geolocator_android/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+
diff --git a/geolocator_android/example/android/settings.gradle b/geolocator_android/example/android/settings.gradle
index 30f7cbca..56eb85cb 100644
--- a/geolocator_android/example/android/settings.gradle
+++ b/geolocator_android/example/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
+    id "com.android.application" version "8.7.0" apply false
 }
 
 include ":app"
\ No newline at end of file
diff --git a/geolocator_android/example/lib/main.dart b/geolocator_android/example/lib/main.dart
index 9c4f7260..3934a102 100644
--- a/geolocator_android/example/lib/main.dart
+++ b/geolocator_android/example/lib/main.dart
@@ -17,17 +17,21 @@ void main() {
 
 /// Example [Widget] showing the functionalities of the geolocator plugin.
 class GeolocatorWidget extends StatefulWidget {
-  /// Creates a new GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  /// Creates a [PermissionHandlerWidget].
+  const GeolocatorWidget({
+    super.key,
+  });
 
-  /// Utility method to create a page with the Baseflow templating.
+  /// Create a page containing the functionality of this plugin
   static ExamplePage createPage() {
     return ExamplePage(
         Icons.location_on, (context) => const GeolocatorWidget());
   }
 
   @override
-  _GeolocatorWidgetState createState() => _GeolocatorWidgetState();
+  State<GeolocatorWidget> createState() {
+    return _GeolocatorWidgetState();
+  }
 }
 
 class _GeolocatorWidgetState extends State<GeolocatorWidget> {
@@ -75,26 +79,26 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
       },
       itemBuilder: (context) => [
         const PopupMenuItem(
-          child: Text("Get Location Accuracy"),
           value: 1,
+          child: Text("Get Location Accuracy"),
         ),
         if (Platform.isIOS)
           const PopupMenuItem(
-            child: Text("Request Temporary Full Accuracy"),
             value: 2,
+            child: Text("Request Temporary Full Accuracy"),
           ),
         const PopupMenuItem(
-          child: Text("Open App Settings"),
           value: 3,
+          child: Text("Open App Settings"),
         ),
         if (Platform.isAndroid)
           const PopupMenuItem(
-            child: Text("Open Location Settings"),
             value: 4,
+            child: Text("Open Location Settings"),
           ),
         const PopupMenuItem(
-          child: Text("Clear"),
           value: 5,
+          child: Text("Clear"),
         ),
       ],
     );
@@ -150,10 +154,6 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: [
                   FloatingActionButton(
-                    child: (_positionStreamSubscription == null ||
-                            _positionStreamSubscription!.isPaused)
-                        ? const Icon(Icons.play_arrow)
-                        : const Icon(Icons.pause),
                     onPressed: _toggleListening,
                     tooltip: (_positionStreamSubscription == null)
                         ? 'Start position updates'
@@ -161,16 +161,20 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
                             ? 'Resume'
                             : 'Pause',
                     backgroundColor: _determineButtonColor(),
+                    child: (_positionStreamSubscription == null ||
+                            _positionStreamSubscription!.isPaused)
+                        ? const Icon(Icons.play_arrow)
+                        : const Icon(Icons.pause),
                   ),
                   sizedBox,
                   FloatingActionButton(
-                    child: const Icon(Icons.my_location),
                     onPressed: _getCurrentPosition,
+                    child: const Icon(Icons.my_location),
                   ),
                   sizedBox,
                   FloatingActionButton(
-                    child: const Icon(Icons.bookmark),
                     onPressed: _getLastKnownPosition,
+                    child: const Icon(Icons.bookmark),
                   ),
                 ],
               ),
diff --git a/geolocator_android/example/pubspec.yaml b/geolocator_android/example/pubspec.yaml
index 22febac1..961e6bfb 100644
--- a/geolocator_android/example/pubspec.yaml
+++ b/geolocator_android/example/pubspec.yaml
@@ -6,12 +6,13 @@ description: Demonstrates how to use the geolocator_android plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
   flutter:
     sdk: flutter
+  geolocator_platform_interface: ^4.2.4
 
   geolocator_android:
     # When depending on this package from a real application you should use:
@@ -32,7 +33,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.4
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/geolocator_android/lib/src/types/android_position.dart b/geolocator_android/lib/src/types/android_position.dart
index 4105b8d0..d44396b5 100644
--- a/geolocator_android/lib/src/types/android_position.dart
+++ b/geolocator_android/lib/src/types/android_position.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: use_super_parameters
+
 import 'package:geolocator_platform_interface/geolocator_platform_interface.dart';
 // ignore: depend_on_referenced_packages
 import 'package:meta/meta.dart';
@@ -21,7 +23,7 @@ class AndroidPosition extends Position {
     required headingAccuracy,
     required speed,
     required speedAccuracy,
-    int? floor,
+    super.floor,
     isMocked = false,
   }) : super(
           longitude: longitude,
@@ -34,7 +36,6 @@ class AndroidPosition extends Position {
           headingAccuracy: headingAccuracy,
           speed: speed,
           speedAccuracy: speedAccuracy,
-          floor: floor,
           isMocked: isMocked,
         );
 
diff --git a/geolocator_android/lib/src/types/android_settings.dart b/geolocator_android/lib/src/types/android_settings.dart
index fea5dfb0..0cd39923 100644
--- a/geolocator_android/lib/src/types/android_settings.dart
+++ b/geolocator_android/lib/src/types/android_settings.dart
@@ -11,16 +11,13 @@ class AndroidSettings extends LocationSettings {
   /// - forceLocationManager: false
   AndroidSettings({
     this.forceLocationManager = false,
-    LocationAccuracy accuracy = LocationAccuracy.best,
-    int distanceFilter = 0,
+    super.accuracy,
+    super.distanceFilter,
     this.intervalDuration,
-    Duration? timeLimit,
+    super.timeLimit,
     this.foregroundNotificationConfig,
     this.useMSLAltitude = false,
-  }) : super(
-            accuracy: accuracy,
-            distanceFilter: distanceFilter,
-            timeLimit: timeLimit);
+  });
 
   /// Forces the Geolocator plugin to use the legacy LocationManager instead of
   /// the FusedLocationProviderClient (Android only).
diff --git a/geolocator_android/lib/src/types/foreground_settings.dart b/geolocator_android/lib/src/types/foreground_settings.dart
index 09ad60f8..22983e09 100644
--- a/geolocator_android/lib/src/types/foreground_settings.dart
+++ b/geolocator_android/lib/src/types/foreground_settings.dart
@@ -119,7 +119,7 @@ class ForegroundNotificationConfig {
       'notificationText': notificationText,
       'notificationChannelName': notificationChannelName,
       'setOngoing': setOngoing,
-      'color': color?.value,
+      'color': color?.toARGB32(),
     };
   }
 }
diff --git a/geolocator_android/pubspec.yaml b/geolocator_android/pubspec.yaml
index 8841c116..80017321 100644
--- a/geolocator_android/pubspec.yaml
+++ b/geolocator_android/pubspec.yaml
@@ -2,11 +2,11 @@ name: geolocator_android
 description: Geolocation plugin for Flutter. This plugin provides the Android implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_android
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 4.6.1
+version: 5.0.1
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
-  flutter: ">=2.8.0"
+  sdk: ^3.5.0
+  flutter: ">=2.17.0"
 
 flutter:
   plugin:
diff --git a/geolocator_android/test/geolocator_android_test.dart b/geolocator_android/test/geolocator_android_test.dart
index 6611a6ba..67c8a60c 100644
--- a/geolocator_android/test/geolocator_android_test.dart
+++ b/geolocator_android/test/geolocator_android_test.dart
@@ -1511,7 +1511,7 @@ void main() {
         );
         expect(
           jsonMap['foregroundNotificationConfig']['color'],
-          settings.foregroundNotificationConfig!.color!.value,
+          settings.foregroundNotificationConfig!.color!.toARGB32,
         );
       });
 
diff --git a/geolocator_apple/CHANGELOG.md b/geolocator_apple/CHANGELOG.md
index 815ecb4b..7919ee6a 100644
--- a/geolocator_apple/CHANGELOG.md
+++ b/geolocator_apple/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 2.3.14
+
+* Updates `flutter_lints` package.
+
+## 2.3.13
+
+* Adds Swift Package Manager compatibility.
+
+## 2.3.12
+
+* Removed deprecated `-[UIApplication openURL:]` dead code.
+
+## 2.3.11
+
+* Adds privacy manifest for macOS to the podspec.
+
+## 2.3.10
+
+* Updated dart sdk to sdk: `^3.5.0`
+* Fixed example project warnings
+
+## 2.3.9
+
+* Adds privacy manifest for macOS.
+
+## 2.3.8+1
+
+* HOT FIX: Adds back implementation of the `stopListening` method in the `GeolocationHandler.m` file.
+
+## 2.3.8
+
+* Uses different `CLLocationManager` instances, for one time request location and persistent request location. 
+* Fixes a bug where iOS location settings, e.g. `accuracy` and `distanceFilter` are overridden by different calls.
+* Updates minimum deployment target to `iOS 11` as lower is not supported anymore by Xcode.
+
 ## 2.3.7
 
 * Adds privacy manifest.
diff --git a/geolocator_apple/ios/.gitignore b/geolocator_apple/darwin/.gitignore
similarity index 100%
rename from geolocator_apple/ios/.gitignore
rename to geolocator_apple/darwin/.gitignore
diff --git a/geolocator_apple/ios/geolocator_apple.podspec b/geolocator_apple/darwin/geolocator_apple.podspec
similarity index 61%
rename from geolocator_apple/ios/geolocator_apple.podspec
rename to geolocator_apple/darwin/geolocator_apple.podspec
index e2ab47f3..8fbcc085 100644
--- a/geolocator_apple/ios/geolocator_apple.podspec
+++ b/geolocator_apple/darwin/geolocator_apple.podspec
@@ -5,7 +5,7 @@
 Pod::Spec.new do |s|
   s.name             = 'geolocator_apple'
   s.version          = '1.2.0'
-  s.summary          = 'Geolocation iOS plugin for Flutter.'
+  s.summary          = 'Geolocation iOS & macOS plugin for Flutter.'
   s.description      = <<-DESC
   Geolocation iOS plugin for Flutter. This plugin provides the Apple implementation for the geolocator plugin.
                        DESC
@@ -13,13 +13,16 @@ Pod::Spec.new do |s|
   s.license          = { :type => 'MIT', :file => '../LICENSE' }
   s.author           = { 'Baseflow' => 'hello@baseflow.com' }
   s.source           = { :http => 'https://github.com/baseflow/flutter-geolocator/tree/master/' }
-  s.source_files = 'Classes/**/*.{h,m}'
-  s.public_header_files = 'Classes/**/*.h'
-  s.module_map = 'Classes/GeolocatorPlugin.modulemap'
-  s.dependency 'Flutter'
-  s.platform = :ios, '8.0'
+  s.source_files = 'geolocator_apple/Sources/geolocator_apple/**/*.{h,m}'
+  s.public_header_files = 'geolocator_apple/Sources/geolocator_apple/include/**/*.h'
+  s.module_map = 'geolocator_apple/Sources/geolocator_apple/include/GeolocatorPlugin.modulemap'
+
+  s.ios.dependency 'Flutter'
+  s.osx.dependency 'FlutterMacOS'
+  s.ios.deployment_target = '11.0'
+  s.osx.deployment_target = '10.11'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386'}
-  s.resource_bundles = {'geolocator_apple_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
+  s.resource_bundles = {'geolocator_apple_privacy' => ['geolocator_apple/Sources/geolocator_apple/PrivacyInfo.xcprivacy']}
 end
diff --git a/geolocator_apple/darwin/geolocator_apple/Package.swift b/geolocator_apple/darwin/geolocator_apple/Package.swift
new file mode 100644
index 00000000..2be06178
--- /dev/null
+++ b/geolocator_apple/darwin/geolocator_apple/Package.swift
@@ -0,0 +1,29 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "geolocator_apple",
+    platforms: [
+        .iOS("11.0"),
+        .macOS("10.11")
+    ],
+    products: [
+        .library(name: "geolocator-apple", targets: ["geolocator_apple"])
+    ],
+    dependencies: [],
+    targets: [
+        .target(
+            name: "geolocator_apple",
+            dependencies: [],
+            resources: [
+                .process("PrivacyInfo.xcprivacy")
+            ],
+            publicHeadersPath: "include/geolocator_apple",
+            cSettings: [
+                .headerSearchPath("include/geolocator_apple")
+            ]
+        )
+    ]
+)
diff --git a/geolocator_apple/ios/Classes/Constants/ErrorCodes.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Constants/ErrorCodes.m
similarity index 91%
rename from geolocator_apple/ios/Classes/Constants/ErrorCodes.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Constants/ErrorCodes.m
index b1ffe7a0..5cf19d91 100644
--- a/geolocator_apple/ios/Classes/Constants/ErrorCodes.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Constants/ErrorCodes.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 24/06/2020.
 //
 
-#import "ErrorCodes.h"
+#import "../include/geolocator_apple/Constants/ErrorCodes.h"
 
 NSString * const GeolocatorErrorLocationUpdateFailure = @"LOCATION_UPDATE_FAILURE";
 NSString * const GeolocatorErrorLocationServicesDisabled = @"LOCATION_SERVICES_DISABLED";
diff --git a/geolocator_apple/ios/Classes/GeolocatorPlugin.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/GeolocatorPlugin.m
similarity index 86%
rename from geolocator_apple/ios/Classes/GeolocatorPlugin.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/GeolocatorPlugin.m
index 0e3687a9..dddad77d 100644
--- a/geolocator_apple/ios/Classes/GeolocatorPlugin.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/GeolocatorPlugin.m
@@ -1,18 +1,18 @@
 #import <CoreLocation/CoreLocation.h>
-#import "GeolocatorPlugin.h"
-#import "GeolocatorPlugin_Test.h"
-#import "Constants/ErrorCodes.h"
-#import "Handlers/GeolocationHandler.h"
-#import "Handlers/PermissionHandler.h"
-#import "Handlers/PositionStreamHandler.h"
-#import "Utils/ActivityTypeMapper.h"
-#import "Utils/AuthorizationStatusMapper.h"
-#import "Utils/LocationAccuracyMapper.h"
-#import "Utils/LocationDistanceMapper.h"
-#import "Utils/LocationMapper.h"
-#import "Utils/PermissionUtils.h"
-#import "Handlers/LocationAccuracyHandler.h"
-#import "Handlers/LocationServiceStreamHandler.h"
+#import "./include/geolocator_apple/GeolocatorPlugin.h"
+#import "./include/geolocator_apple/GeolocatorPlugin_Test.h"
+#import "./include/geolocator_apple/Constants/ErrorCodes.h"
+#import "./include/geolocator_apple/Handlers/GeolocationHandler.h"
+#import "./include/geolocator_apple/Handlers/PermissionHandler.h"
+#import "./include/geolocator_apple/Handlers/PositionStreamHandler.h"
+#import "./include/geolocator_apple/Utils/ActivityTypeMapper.h"
+#import "./include/geolocator_apple/Utils/AuthorizationStatusMapper.h"
+#import "./include/geolocator_apple/Utils/LocationAccuracyMapper.h"
+#import "./include/geolocator_apple/Utils/LocationDistanceMapper.h"
+#import "./include/geolocator_apple/Utils/LocationMapper.h"
+#import "./include/geolocator_apple/Utils/PermissionUtils.h"
+#import "./include/geolocator_apple/Handlers/LocationAccuracyHandler.h"
+#import "./include/geolocator_apple/Handlers/LocationServiceStreamHandler.h"
 
 @interface GeolocatorPlugin ()
 
@@ -175,20 +175,12 @@ - (void)openSettings:(FlutterResult)result {
   BOOL success = [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:urlString]];
   result([[NSNumber alloc] initWithBool:success]);
 #else
-  if (@available(iOS 10, *)) {
-    [[UIApplication sharedApplication]
-     openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
-     options:[[NSDictionary alloc] init]
-     completionHandler:^(BOOL success) {
-      result([[NSNumber alloc] initWithBool:success]);
-    }];
-  } else if (@available(iOS 8.0, *)) {
-    BOOL success = [[UIApplication sharedApplication]
-                    openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
+  [[UIApplication sharedApplication]
+   openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
+   options:[[NSDictionary alloc] init]
+   completionHandler:^(BOOL success) {
     result([[NSNumber alloc] initWithBool:success]);
-  } else {
-    result([[NSNumber alloc] initWithBool:NO]);
-  }
+  }];
 #endif
 }
 @end
diff --git a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.m
similarity index 63%
rename from geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.m
index 0ebc96bd..162b3d9a 100644
--- a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.m
@@ -5,20 +5,20 @@
 //  Created by Maurits van Beusekom on 20/06/2020.
 //
 
-#import "GeolocationHandler.h"
-#import "GeolocationHandler_Test.h"
-#import "../Constants/ErrorCodes.h"
+#import "../include/geolocator_apple/Handlers/GeolocationHandler.h"
+#import "../include/geolocator_apple/Handlers/GeolocationHandler_Test.h"
+#import "../include/geolocator_apple/Constants/ErrorCodes.h"
 
 double const kMaxLocationLifeTimeInSeconds = 5.0;
 
 @interface GeolocationHandler() <CLLocationManagerDelegate>
 
-@property(assign, nonatomic) bool isListeningForPositionUpdates;
-
 @property(strong, nonatomic, nonnull) CLLocationManager *locationManager;
-
 @property(strong, nonatomic) GeolocatorError errorHandler;
 
+@property(strong, nonatomic, nonnull) CLLocationManager *oneTimeLocationManager;
+@property(strong, nonatomic) GeolocatorError oneTimeErrorHandler;
+
 @property(strong, nonatomic) GeolocatorResult currentLocationResultHandler;
 @property(strong, nonatomic) GeolocatorResult listenerResultHandler;
 
@@ -32,8 +32,7 @@ - (id) init {
   if (!self) {
     return nil;
   }
-    
-  self.isListeningForPositionUpdates = NO;
+  
   return self;
 }
 
@@ -49,32 +48,42 @@ - (void)setLocationManagerOverride:(CLLocationManager *)locationManager {
   self.locationManager = locationManager;
 }
 
-- (CLLocation *)getLastKnownPosition {
+- (CLLocationManager *) getOneTimeLocationManager {
+  if (!self.oneTimeLocationManager) {
+    self.oneTimeLocationManager = [[CLLocationManager alloc] init];
+    self.oneTimeLocationManager.delegate = self;
+  }
+  return self.oneTimeLocationManager;
+}
+
+- (void)setOneTimeLocationManagerOverride:(CLLocationManager *)locationManager {
+  self.oneTimeLocationManager = locationManager;
+}
+
+- (CLLocation *) getLastKnownPosition {
   CLLocationManager *locationManager = [self getLocationManager];
-  return [locationManager location];
+  CLLocation *cashedLocation = [locationManager location];
+  if (cashedLocation != nil) {
+    return cashedLocation;
+  }
+  CLLocationManager *persistentLocationManager = [self getOneTimeLocationManager];
+  return [persistentLocationManager location];
 }
 
 - (void)requestPositionWithDesiredAccuracy:(CLLocationAccuracy)desiredAccuracy
                              resultHandler:(GeolocatorResult _Nonnull)resultHandler
                               errorHandler:(GeolocatorError _Nonnull)errorHandler {
-  self.errorHandler = errorHandler;
+  self.oneTimeErrorHandler = errorHandler;
   self.currentLocationResultHandler = resultHandler;
-    
+  
   BOOL showBackgroundLocationIndicator = NO;
   BOOL allowBackgroundLocationUpdates = NO;
-  #if TARGET_OS_IOS
-    if (self.isListeningForPositionUpdates) {
-      CLLocationManager *locationManager = [self getLocationManager];
-      showBackgroundLocationIndicator = locationManager.showsBackgroundLocationIndicator;
-      allowBackgroundLocationUpdates = locationManager.allowsBackgroundLocationUpdates;
-    }
-  #endif
   
   [self startUpdatingLocationWithDesiredAccuracy:desiredAccuracy
                                   distanceFilter:kCLDistanceFilterNone
                pauseLocationUpdatesAutomatically:NO
                                     activityType:CLActivityTypeOther
-                   isListeningForPositionUpdates:self.isListeningForPositionUpdates
+                   isListeningForPositionUpdates:NO
                  showBackgroundLocationIndicator:showBackgroundLocationIndicator
                   allowBackgroundLocationUpdates:allowBackgroundLocationUpdates];
 }
@@ -87,10 +96,10 @@ - (void)startListeningWithDesiredAccuracy:(CLLocationAccuracy)desiredAccuracy
            allowBackgroundLocationUpdates:(BOOL)allowBackgroundLocationUpdates
                             resultHandler:(GeolocatorResult _Nonnull )resultHandler
                              errorHandler:(GeolocatorError _Nonnull)errorHandler {
-    
+  
   self.errorHandler = errorHandler;
   self.listenerResultHandler = resultHandler;
-    
+  
   [self startUpdatingLocationWithDesiredAccuracy:desiredAccuracy
                                   distanceFilter:distanceFilter
                pauseLocationUpdatesAutomatically:pauseLocationUpdatesAutomatically
@@ -107,60 +116,67 @@ - (void)startUpdatingLocationWithDesiredAccuracy:(CLLocationAccuracy)desiredAccu
                    isListeningForPositionUpdates:(BOOL)isListeningForPositionUpdates
                  showBackgroundLocationIndicator:(BOOL)showBackgroundLocationIndicator
                   allowBackgroundLocationUpdates:(BOOL)allowBackgroundLocationUpdates
-                            {
-  self.isListeningForPositionUpdates = isListeningForPositionUpdates;
-  CLLocationManager *locationManager = [self getLocationManager];
-  locationManager.desiredAccuracy = desiredAccuracy;
-  locationManager.distanceFilter = distanceFilter;
-  if (@available(iOS 6.0, macOS 10.15, *)) {
-    locationManager.activityType = activityType;
-    locationManager.pausesLocationUpdatesAutomatically = pauseLocationUpdatesAutomatically;
-  }
+{
   
+  if (isListeningForPositionUpdates) {
+    CLLocationManager *locationManager = [self getLocationManager];
+    locationManager.desiredAccuracy = desiredAccuracy;
+    locationManager.distanceFilter = distanceFilter;
+    if (@available(iOS 6.0, macOS 10.15, *)) {
+      locationManager.activityType = activityType;
+      locationManager.pausesLocationUpdatesAutomatically = pauseLocationUpdatesAutomatically;
+    }
+    
 #if TARGET_OS_IOS
-  if (@available(iOS 9.0, macOS 11.0, *)) {
     locationManager.allowsBackgroundLocationUpdates = allowBackgroundLocationUpdates
-      && [GeolocationHandler shouldEnableBackgroundLocationUpdates];
-  }
-  if (@available(iOS 11.0, macOS 11.0, *)) {
+    && [GeolocationHandler shouldEnableBackgroundLocationUpdates];
     locationManager.showsBackgroundLocationIndicator = showBackgroundLocationIndicator;
-  }
 #endif
-  
-  [locationManager startUpdatingLocation];
+    [locationManager startUpdatingLocation];
+  } else {
+    CLLocationManager *locationManager = [self getOneTimeLocationManager];
+    locationManager.desiredAccuracy = desiredAccuracy;
+    locationManager.distanceFilter = distanceFilter;
+    [locationManager startUpdatingLocation];
+  }
+}
+
+- (void)stopOneTimeLocationListening {
+  [[self getOneTimeLocationManager] stopUpdatingLocation];
+  self.oneTimeErrorHandler = nil;
+  self.currentLocationResultHandler = nil;
 }
 
 - (void)stopListening {
-  [[self getLocationManager] stopUpdatingLocation];
-  self.isListeningForPositionUpdates = NO;
-  self.errorHandler = nil;
-  self.listenerResultHandler = nil;
+    [[self getLocationManager] stopUpdatingLocation];
+    self.errorHandler = nil;
+    self.listenerResultHandler = nil;
 }
 
 - (void)locationManager:(CLLocationManager *)manager
      didUpdateLocations:(NSArray<CLLocation *> *)locations {
   if (!self.listenerResultHandler && !self.currentLocationResultHandler) return;
-
+  
   CLLocation *mostRecentLocation = [locations lastObject];
   NSTimeInterval ageInSeconds = -[mostRecentLocation.timestamp timeIntervalSinceNow];
   // If location is older then 5.0 seconds it is likely a cached location which
   // will be skipped.
-  if (!self.isListeningForPositionUpdates && ageInSeconds > kMaxLocationLifeTimeInSeconds) {
+  if (manager == [self getOneTimeLocationManager] && ageInSeconds > kMaxLocationLifeTimeInSeconds) {
     return;
   }
-    
+  
   if ([locations lastObject]) {
-      if (self.currentLocationResultHandler != nil) {
-          self.currentLocationResultHandler(mostRecentLocation);
-      }
-      if (self.listenerResultHandler != nil) {
-          self.listenerResultHandler(mostRecentLocation);
-      }
+    if (self.currentLocationResultHandler != nil) {
+      self.currentLocationResultHandler(mostRecentLocation);
+    }
+    if (self.listenerResultHandler != nil) {
+      self.listenerResultHandler(mostRecentLocation);
+    }
   }
-
+  
   self.currentLocationResultHandler = nil;
-  if (!self.isListeningForPositionUpdates) {
-    [self stopListening];
+  if (manager == [self getOneTimeLocationManager]) {
+    [self stopOneTimeLocationListening];
   }
 }
 
@@ -178,17 +194,16 @@ - (void)locationManager:(CLLocationManager *)manager
     self.errorHandler(GeolocatorErrorLocationUpdateFailure, error.localizedDescription);
   }
   
-  self.currentLocationResultHandler = nil;
-  if (!self.isListeningForPositionUpdates) {
-    [self stopListening];
+  if (self.oneTimeErrorHandler) {
+    self.oneTimeErrorHandler(GeolocatorErrorLocationUpdateFailure, error.localizedDescription);
+  }
+  
+  if (manager == [self getOneTimeLocationManager]) {
+    [self stopOneTimeLocationListening];
   }
 }
 
 + (BOOL) shouldEnableBackgroundLocationUpdates {
-  if (@available(iOS 9.0, *)) {
-    return [[NSBundle.mainBundle objectForInfoDictionaryKey:@"UIBackgroundModes"] containsObject: @"location"];
-  } else {
-    return NO;
-  }
+  return [[NSBundle.mainBundle objectForInfoDictionaryKey:@"UIBackgroundModes"] containsObject: @"location"];
 }
 @end
diff --git a/geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationAccuracyHandler.m
similarity index 95%
rename from geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationAccuracyHandler.m
index 8891ddc4..ac957808 100644
--- a/geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationAccuracyHandler.m
@@ -7,8 +7,8 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
-#import "LocationAccuracyHandler.h"
-#import "ErrorCodes.h"
+#import "../include/geolocator_apple/Handlers/LocationAccuracyHandler.h"
+#import "../include/geolocator_apple/Constants/ErrorCodes.h"
 
 @interface LocationAccuracyHandler()
 @property (strong, nonatomic) CLLocationManager *locationManager;
diff --git a/geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationServiceStreamHandler.m
similarity index 90%
rename from geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationServiceStreamHandler.m
index ac6e8ff4..e1da6829 100644
--- a/geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationServiceStreamHandler.m
@@ -7,8 +7,8 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
-#import "LocationServiceStreamHandler.h"
-#import "../Utils/ServiceStatus.h"
+#import "../include/geolocator_apple/Handlers/LocationServiceStreamHandler.h"
+#import "../include/geolocator_apple/Utils/ServiceStatus.h"
 
 @interface LocationServiceStreamHandler()
 @property (strong, nonatomic) CLLocationManager *locationManager;
diff --git a/geolocator_apple/ios/Classes/Handlers/PermissionHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PermissionHandler.m
similarity index 95%
rename from geolocator_apple/ios/Classes/Handlers/PermissionHandler.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PermissionHandler.m
index 42f4394a..265401aa 100644
--- a/geolocator_apple/ios/Classes/Handlers/PermissionHandler.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PermissionHandler.m
@@ -5,9 +5,9 @@
 //  Created by Maurits van Beusekom on 26/06/2020.
 //
 
-#import "PermissionHandler.h"
-#import "../Constants/ErrorCodes.h"
-#import "../Utils/PermissionUtils.h"
+#import "../include/geolocator_apple/Handlers/PermissionHandler.h"
+#import "../include/geolocator_apple/Constants/ErrorCodes.h"
+#import "../include/geolocator_apple/Utils/PermissionUtils.h"
 
 @interface PermissionHandler() <CLLocationManagerDelegate>
 
diff --git a/geolocator_apple/ios/Classes/Handlers/PositionStreamHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PositionStreamHandler.m
similarity index 88%
rename from geolocator_apple/ios/Classes/Handlers/PositionStreamHandler.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PositionStreamHandler.m
index 1326ea14..c65449fa 100644
--- a/geolocator_apple/ios/Classes/Handlers/PositionStreamHandler.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/PositionStreamHandler.m
@@ -5,13 +5,13 @@
 //  Created by Maurits van Beusekom on 04/06/2021.
 //
 
-#import "PermissionHandler.h"
-#import "PositionStreamHandler.h"
-#import "../Constants/ErrorCodes.h"
-#import "../Utils/ActivityTypeMapper.h"
-#import "../Utils/LocationAccuracyMapper.h"
-#import "../Utils/LocationDistanceMapper.h"
-#import "../Utils/LocationMapper.h"
+#import "../include/geolocator_apple/Handlers/PermissionHandler.h"
+#import "../include/geolocator_apple/Handlers/PositionStreamHandler.h"
+#import "../include/geolocator_apple/Constants/ErrorCodes.h"
+#import "../include/geolocator_apple/Utils/ActivityTypeMapper.h"
+#import "../include/geolocator_apple/Utils/LocationAccuracyMapper.h"
+#import "../include/geolocator_apple/Utils/LocationDistanceMapper.h"
+#import "../include/geolocator_apple/Utils/LocationMapper.h"
 
 @interface PositionStreamHandler()
 @property (strong, nonatomic, nonnull) GeolocationHandler *geolocationHandler;
diff --git a/geolocator_apple/ios/Resources/PrivacyInfo.xcprivacy b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/PrivacyInfo.xcprivacy
similarity index 100%
rename from geolocator_apple/ios/Resources/PrivacyInfo.xcprivacy
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/PrivacyInfo.xcprivacy
diff --git a/geolocator_apple/ios/Classes/Utils/ActivityTypeMapper.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/ActivityTypeMapper.m
similarity index 92%
rename from geolocator_apple/ios/Classes/Utils/ActivityTypeMapper.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/ActivityTypeMapper.m
index 3d8a6d47..96f763f2 100644
--- a/geolocator_apple/ios/Classes/Utils/ActivityTypeMapper.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/ActivityTypeMapper.m
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ActivityTypeMapper.h"
+#import "../include/geolocator_apple/Utils/ActivityTypeMapper.h"
 
 @implementation ActivityTypeMapper
 
diff --git a/geolocator_apple/ios/Classes/Utils/AuthorizationStatusMapper.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/AuthorizationStatusMapper.m
similarity index 90%
rename from geolocator_apple/ios/Classes/Utils/AuthorizationStatusMapper.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/AuthorizationStatusMapper.m
index bb1ff92b..ebdadfe6 100644
--- a/geolocator_apple/ios/Classes/Utils/AuthorizationStatusMapper.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/AuthorizationStatusMapper.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 15/06/2020.
 //
 
-#import "AuthorizationStatusMapper.h"
+#import "../include/geolocator_apple/Utils/AuthorizationStatusMapper.h"
 
 @implementation AuthorizationStatusMapper
 + (NSNumber *) toDartIndex: (CLAuthorizationStatus) authorizationStatus {
diff --git a/geolocator_apple/ios/Classes/Utils/LocationAccuracyMapper.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationAccuracyMapper.m
similarity index 93%
rename from geolocator_apple/ios/Classes/Utils/LocationAccuracyMapper.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationAccuracyMapper.m
index 1601e78b..6cefeea3 100644
--- a/geolocator_apple/ios/Classes/Utils/LocationAccuracyMapper.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationAccuracyMapper.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 06/07/2020.
 //
 
-#import "LocationAccuracyMapper.h"
+#import "../include/geolocator_apple/Utils/LocationAccuracyMapper.h"
 
 @implementation LocationAccuracyMapper
 
diff --git a/geolocator_apple/ios/Classes/Utils/LocationDistanceMapper.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationDistanceMapper.m
similarity index 82%
rename from geolocator_apple/ios/Classes/Utils/LocationDistanceMapper.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationDistanceMapper.m
index 64f437e5..8ca6ed59 100644
--- a/geolocator_apple/ios/Classes/Utils/LocationDistanceMapper.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationDistanceMapper.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 06/07/2020.
 //
 
-#import "LocationDistanceMapper.h"
+#import "../include/geolocator_apple/Utils/LocationDistanceMapper.h"
 
 @implementation LocationDistanceMapper
 
diff --git a/geolocator_apple/ios/Classes/Utils/LocationMapper.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationMapper.m
similarity index 98%
rename from geolocator_apple/ios/Classes/Utils/LocationMapper.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationMapper.m
index 7395c586..60e3c775 100644
--- a/geolocator_apple/ios/Classes/Utils/LocationMapper.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/LocationMapper.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 20/06/2020.
 //
 
-#import "LocationMapper.h"
+#import "../include/geolocator_apple/Utils/LocationMapper.h"
 
 @implementation LocationMapper
 + (NSDictionary *) toDictionary:(CLLocation *)location {
diff --git a/geolocator_apple/ios/Classes/Utils/PermissionUtils.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/PermissionUtils.m
similarity index 91%
rename from geolocator_apple/ios/Classes/Utils/PermissionUtils.m
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/PermissionUtils.m
index 951a21da..42bb627c 100644
--- a/geolocator_apple/ios/Classes/Utils/PermissionUtils.m
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Utils/PermissionUtils.m
@@ -5,7 +5,7 @@
 //  Created by Maurits van Beusekom on 27/08/2021.
 //
 
-#import "PermissionUtils.h"
+#import "../include/geolocator_apple/Utils/PermissionUtils.h"
 
 @implementation PermissionUtils
 + (BOOL) isStatusGranted:(CLAuthorizationStatus)authorizationStatus {
diff --git a/geolocator_apple/ios/Classes/GeolocatorPlugin.modulemap b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/GeolocatorPlugin.modulemap
similarity index 100%
rename from geolocator_apple/ios/Classes/GeolocatorPlugin.modulemap
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/GeolocatorPlugin.modulemap
diff --git a/geolocator_apple/ios/Classes/geolocator-umbrella.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator-umbrella.h
similarity index 100%
rename from geolocator_apple/ios/Classes/geolocator-umbrella.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator-umbrella.h
diff --git a/geolocator_apple/ios/Classes/Constants/ErrorCodes.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Constants/ErrorCodes.h
similarity index 93%
rename from geolocator_apple/ios/Classes/Constants/ErrorCodes.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Constants/ErrorCodes.h
index fa87ca14..025dea2d 100644
--- a/geolocator_apple/ios/Classes/Constants/ErrorCodes.h
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Constants/ErrorCodes.h
@@ -5,6 +5,8 @@
 //  Created by Maurits van Beusekom on 24/06/2020.
 //
 
+#import <Foundation/Foundation.h>
+
 FOUNDATION_EXPORT NSString * const GeolocatorErrorLocationUpdateFailure;
 FOUNDATION_EXPORT NSString * const GeolocatorErrorLocationServicesDisabled;
 FOUNDATION_EXPORT NSString * const GeolocatorErrorLocationSubscriptionActive;
diff --git a/geolocator_apple/ios/Classes/GeolocatorPlugin.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/GeolocatorPlugin.h
similarity index 100%
rename from geolocator_apple/ios/Classes/GeolocatorPlugin.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/GeolocatorPlugin.h
diff --git a/geolocator_apple/ios/Classes/GeolocatorPlugin_Test.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/GeolocatorPlugin_Test.h
similarity index 83%
rename from geolocator_apple/ios/Classes/GeolocatorPlugin_Test.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/GeolocatorPlugin_Test.h
index 10aa1018..3bca866e 100644
--- a/geolocator_apple/ios/Classes/GeolocatorPlugin_Test.h
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/GeolocatorPlugin_Test.h
@@ -1,8 +1,14 @@
 // This header is available in the Test module. Import via "@import geolocator_apple.Test;"
 
+#if __has_include(<geolocator_apple/GeolocationHandler.h>)
 #import <geolocator_apple/GeolocationHandler.h>
 #import <geolocator_apple/LocationAccuracyHandler.h>
 #import <geolocator_apple/PermissionHandler.h>
+#else
+#import "Handlers/GeolocationHandler.h"
+#import "Handlers/LocationAccuracyHandler.h"
+#import "Handlers/PermissionHandler.h"
+#endif
 
 /// Methods exposed for unit testing.
 @interface GeolocatorPlugin(Test)
diff --git a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/GeolocationHandler.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Handlers/GeolocationHandler.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/GeolocationHandler.h
diff --git a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler_Test.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/GeolocationHandler_Test.h
similarity index 67%
rename from geolocator_apple/ios/Classes/Handlers/GeolocationHandler_Test.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/GeolocationHandler_Test.h
index fed2845d..302b1a7d 100644
--- a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler_Test.h
+++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/GeolocationHandler_Test.h
@@ -9,4 +9,8 @@
 /// This should only be used for testing purposes.
 - (void)setLocationManagerOverride:(CLLocationManager *)locationManager;
 
+/// Overrides the CLLocationManager instance used by the GeolocationHandler.
+/// This should only be used for testing purposes.
+- (void)setOneTimeLocationManagerOverride:(CLLocationManager *)locationManager;
+
 @end
diff --git a/geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/LocationAccuracyHandler.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/LocationAccuracyHandler.h
diff --git a/geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/LocationServiceStreamHandler.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Handlers/LocationServiceStreamHandler.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/LocationServiceStreamHandler.h
diff --git a/geolocator_apple/ios/Classes/Handlers/PermissionHandler.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/PermissionHandler.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Handlers/PermissionHandler.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/PermissionHandler.h
diff --git a/geolocator_apple/ios/Classes/Handlers/PositionStreamHandler.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/PositionStreamHandler.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Handlers/PositionStreamHandler.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Handlers/PositionStreamHandler.h
diff --git a/geolocator_apple/ios/Classes/Utils/ActivityTypeMapper.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/ActivityTypeMapper.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/ActivityTypeMapper.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/ActivityTypeMapper.h
diff --git a/geolocator_apple/ios/Classes/Utils/AuthorizationStatusMapper.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/AuthorizationStatusMapper.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/AuthorizationStatusMapper.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/AuthorizationStatusMapper.h
diff --git a/geolocator_apple/ios/Classes/Utils/LocationAccuracyMapper.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationAccuracyMapper.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/LocationAccuracyMapper.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationAccuracyMapper.h
diff --git a/geolocator_apple/ios/Classes/Utils/LocationDistanceMapper.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationDistanceMapper.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/LocationDistanceMapper.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationDistanceMapper.h
diff --git a/geolocator_apple/ios/Classes/Utils/LocationMapper.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationMapper.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/LocationMapper.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/LocationMapper.h
diff --git a/geolocator_apple/ios/Classes/Utils/PermissionUtils.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/PermissionUtils.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/PermissionUtils.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/PermissionUtils.h
diff --git a/geolocator_apple/ios/Classes/Utils/ServiceStatus.h b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/ServiceStatus.h
similarity index 100%
rename from geolocator_apple/ios/Classes/Utils/ServiceStatus.h
rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/include/geolocator_apple/Utils/ServiceStatus.h
diff --git a/geolocator_apple/example/ios/Flutter/AppFrameworkInfo.plist b/geolocator_apple/example/ios/Flutter/AppFrameworkInfo.plist
index 4f8d4d24..8c6e5614 100644
--- a/geolocator_apple/example/ios/Flutter/AppFrameworkInfo.plist
+++ b/geolocator_apple/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/geolocator_apple/example/ios/Podfile b/geolocator_apple/example/ios/Podfile
index 87a77d50..c654fd27 100644
--- a/geolocator_apple/example/ios/Podfile
+++ b/geolocator_apple/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -31,7 +31,7 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   
   target 'RunnerTests' do
-    platform :ios, '11.0'
+    platform :ios, '12.0'
     inherit! :search_paths
     # Pods for testing
     pod 'OCMock', '~> 3.8.1'
diff --git a/geolocator_apple/example/ios/Runner.xcodeproj/project.pbxproj b/geolocator_apple/example/ios/Runner.xcodeproj/project.pbxproj
index 2608a385..f203a58e 100644
--- a/geolocator_apple/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/geolocator_apple/example/ios/Runner.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 		86CF01536E48F5FD7EA4BF3A /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A4FBB87ACA23BE7AAB26EAD /* libPods-RunnerTests.a */; };
 		94DC9D5BB92DE35994AB163F /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74FF83166DF8B30D7F87CE53 /* libPods-Runner.a */; };
 		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -76,6 +77,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				94DC9D5BB92DE35994AB163F /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -198,6 +200,9 @@
 			dependencies = (
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
 			productType = "com.apple.product-type.application";
@@ -227,7 +232,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -248,6 +253,9 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -448,7 +456,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -530,7 +538,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -579,7 +587,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -656,7 +664,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -683,7 +691,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.geolocatorExample.RunnerTests;
@@ -709,7 +717,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.baseflow.geolocatorExample.RunnerTests;
@@ -754,6 +762,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 4a7e772c..c90b55d4 100644
--- a/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -58,6 +76,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/geolocator_apple/example/ios/RunnerTests/GeolocationHandlerTests.m b/geolocator_apple/example/ios/RunnerTests/GeolocationHandlerTests.m
index a9a6f8e6..f0932cc6 100644
--- a/geolocator_apple/example/ios/RunnerTests/GeolocationHandlerTests.m
+++ b/geolocator_apple/example/ios/RunnerTests/GeolocationHandlerTests.m
@@ -19,14 +19,18 @@ @interface GeolocationHandlerTests : XCTestCase
 
 @implementation GeolocationHandlerTests {
   CLLocationManager *_mockLocationManager;
+  CLLocationManager *_mockOneTimeLocationManager;
+  
   GeolocationHandler *_geolocationHandler;
 }
 
 - (void)setUp {
   _mockLocationManager = OCMClassMock(CLLocationManager.class);
+  _mockOneTimeLocationManager = OCMClassMock(CLLocationManager.class);
   
   _geolocationHandler = [[GeolocationHandler alloc] init];
   [_geolocationHandler setLocationManagerOverride:_mockLocationManager];
+  [_geolocationHandler setOneTimeLocationManagerOverride:_mockOneTimeLocationManager];
 }
 
 #pragma mark - Test requesting current location
@@ -36,25 +40,25 @@ - (void)testGetCurrentPositionShouldCallStartUpdatingLocation {
                                             resultHandler:^(CLLocation * _Nullable location) {}
                                              errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {}];
   
-  OCMVerify(times(1), [self->_mockLocationManager setDesiredAccuracy:kCLLocationAccuracyBest]);
-  OCMVerify(times(1), [self->_mockLocationManager startUpdatingLocation]);
+  OCMVerify(times(1), [self->_mockOneTimeLocationManager setDesiredAccuracy:kCLLocationAccuracyBest]);
+  OCMVerify(times(1), [self->_mockOneTimeLocationManager startUpdatingLocation]);
 }
 
 - (void)testRequestPositionShouldReturnLocationWithinTimeConstraints {
   NSDate *now = [NSDate date];
   NSCalendar *calendar = [NSCalendar currentCalendar];
-    
+  
   CLLocation *firstLocation = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(54.0, 6.4)
                                                             altitude:0.0
                                                   horizontalAccuracy:0
                                                     verticalAccuracy:0
                                                            timestamp:[calendar dateByAddingUnit:NSCalendarUnitSecond value:-6 toDate:now options:0]];
   CLLocation *secondLocation = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(54.1, 6.4)
-                                                            altitude:0.0
-                                                  horizontalAccuracy:0
-                                                    verticalAccuracy:0
-                                                           timestamp:now];
-
+                                                             altitude:0.0
+                                                   horizontalAccuracy:0
+                                                     verticalAccuracy:0
+                                                            timestamp:now];
+  
   
   XCTestExpectation *expectation = [self expectationWithDescription:@"expect result return third location"];
   [_geolocationHandler requestPositionWithDesiredAccuracy:kCLLocationAccuracyBest
@@ -64,20 +68,20 @@ - (void)testRequestPositionShouldReturnLocationWithinTimeConstraints {
   }
                                              errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {}];
   
-  [_geolocationHandler locationManager:_mockLocationManager didUpdateLocations: @[firstLocation]];
-  [_geolocationHandler locationManager:_mockLocationManager didUpdateLocations: @[secondLocation]];
-    
+  [_geolocationHandler locationManager:_mockOneTimeLocationManager didUpdateLocations: @[firstLocation]];
+  [_geolocationHandler locationManager:_mockOneTimeLocationManager didUpdateLocations: @[secondLocation]];
+  
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
   
-  OCMVerify(times(1), [self->_mockLocationManager stopUpdatingLocation]);
+  OCMVerify(times(1), [self->_mockOneTimeLocationManager stopUpdatingLocation]);
 }
 
 - (void)testRequestPositionShouldStopListeningOnResult {
   CLLocation *location = [[CLLocation alloc] initWithCoordinate:CLLocationCoordinate2DMake(54.1, 6.4)
-                                                            altitude:0.0
-                                                  horizontalAccuracy:0
-                                                    verticalAccuracy:0
-                                                           timestamp:[NSDate date]];
+                                                       altitude:0.0
+                                             horizontalAccuracy:0
+                                               verticalAccuracy:0
+                                                      timestamp:[NSDate date]];
   
   XCTestExpectation *expectation = [self expectationWithDescription:@"expect first result return third location"];
   [_geolocationHandler requestPositionWithDesiredAccuracy:kCLLocationAccuracyBest
@@ -88,11 +92,11 @@ - (void)testRequestPositionShouldStopListeningOnResult {
     
   }];
   
-  [_geolocationHandler locationManager:_mockLocationManager didUpdateLocations: @[location]];
+  [_geolocationHandler locationManager:_mockOneTimeLocationManager didUpdateLocations: @[location]];
   
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
   
-  OCMVerify(times(1), [self->_mockLocationManager stopUpdatingLocation]);
+  OCMVerify(times(1), [self->_mockOneTimeLocationManager stopUpdatingLocation]);
 }
 
 - (void)testRequestPositionShouldStopListeningOnError {
@@ -107,11 +111,11 @@ - (void)testRequestPositionShouldStopListeningOnError {
     
   }];
   
-  [_geolocationHandler locationManager:_mockLocationManager didFailWithError: error];
+  [_geolocationHandler locationManager:_mockOneTimeLocationManager didFailWithError: error];
   
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
   
-  OCMVerify(times(1), [self->_mockLocationManager stopUpdatingLocation]);
+  OCMVerify(times(1), [self->_mockOneTimeLocationManager stopUpdatingLocation]);
 }
 
 - (void)testRequestPositionShouldNotStopListeningOnErrorDomainAndErrorLocationUnknown {
@@ -158,7 +162,7 @@ - (void)testStartListeningShouldNotStopListeningWhenListeningToStream {
 - (void)testRequestingPositionWhileListeningDoesntStopStream {
   CLLocation *mockLocation = [[CLLocation alloc] initWithLatitude:54.0 longitude:6.4];
   XCTestExpectation *expectationStream = [self expectationWithDescription:@"expect result return third location"];
-    XCTestExpectation *expectationForeground = [self expectationWithDescription:@"expect result return third location"];
+  XCTestExpectation *expectationForeground = [self expectationWithDescription:@"expect result return third location"];
   [_geolocationHandler startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
                                           distanceFilter:0
                        pauseLocationUpdatesAutomatically:NO
@@ -172,14 +176,14 @@ - (void)testRequestingPositionWhileListeningDoesntStopStream {
                                             errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
     
   }];
-    
+  
   [_geolocationHandler requestPositionWithDesiredAccuracy:kCLLocationAccuracyHundredMeters
                                             resultHandler:^(CLLocation * _Nullable location) {
-      XCTAssertEqual(location, mockLocation);
-      [expectationForeground fulfill];
-    } errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
-        
-    }];
+    XCTAssertEqual(location, mockLocation);
+    [expectationForeground fulfill];
+  } errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
+    
+  }];
   [_geolocationHandler locationManager:_mockLocationManager didUpdateLocations: @[mockLocation]];
   
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
@@ -236,39 +240,39 @@ - (void)testStartListeningShouldNotReportErrorOnErrorDomainAndErrorLocationUnkno
 }
 
 - (void)testListeningBackgroundGeolocationOnlyWhenAllowedAndEnabled {
-    id geolocationHandlerMock = OCMPartialMock(_geolocationHandler);
-    [geolocationHandlerMock setLocationManagerOverride:_mockLocationManager];
-    OCMStub(ClassMethod([geolocationHandlerMock shouldEnableBackgroundLocationUpdates]))._andReturn([NSNumber numberWithBool:YES]);
-    [geolocationHandlerMock startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
-                                            distanceFilter:0
-                         pauseLocationUpdatesAutomatically:NO
-                           showBackgroundLocationIndicator:NO
-                                              activityType:CLActivityTypeOther
-                            allowBackgroundLocationUpdates:YES
-                                             resultHandler:^(CLLocation * _Nullable location) {
-    }
-                                              errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
-      
-    }];
-    OCMVerify([_mockLocationManager setAllowsBackgroundLocationUpdates:YES]);
+  id geolocationHandlerMock = OCMPartialMock(_geolocationHandler);
+  [geolocationHandlerMock setLocationManagerOverride:_mockLocationManager];
+  OCMStub(ClassMethod([geolocationHandlerMock shouldEnableBackgroundLocationUpdates]))._andReturn([NSNumber numberWithBool:YES]);
+  [geolocationHandlerMock startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
+                                             distanceFilter:0
+                          pauseLocationUpdatesAutomatically:NO
+                            showBackgroundLocationIndicator:NO
+                                               activityType:CLActivityTypeOther
+                             allowBackgroundLocationUpdates:YES
+                                              resultHandler:^(CLLocation * _Nullable location) {
+  }
+                                               errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
+    
+  }];
+  OCMVerify([_mockLocationManager setAllowsBackgroundLocationUpdates:YES]);
 }
 
 - (void)testNotListeningBackgroundGeolocationWhenNotEnabled {
-    id geolocationHandlerMock = OCMPartialMock(_geolocationHandler);
-    [geolocationHandlerMock setLocationManagerOverride:_mockLocationManager];
-    OCMStub(ClassMethod([geolocationHandlerMock shouldEnableBackgroundLocationUpdates]))._andReturn([NSNumber numberWithBool:YES]);
-    [geolocationHandlerMock startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
-                                            distanceFilter:0
-                         pauseLocationUpdatesAutomatically:NO
-                           showBackgroundLocationIndicator:NO
-                                              activityType:CLActivityTypeOther
-                            allowBackgroundLocationUpdates:NO
-                                             resultHandler:^(CLLocation * _Nullable location) {
-    }
-                                              errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
-      
-    }];
-    OCMVerify(never(), [_mockLocationManager setAllowsBackgroundLocationUpdates:YES]);
+  id geolocationHandlerMock = OCMPartialMock(_geolocationHandler);
+  [geolocationHandlerMock setLocationManagerOverride:_mockLocationManager];
+  OCMStub(ClassMethod([geolocationHandlerMock shouldEnableBackgroundLocationUpdates]))._andReturn([NSNumber numberWithBool:YES]);
+  [geolocationHandlerMock startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
+                                             distanceFilter:0
+                          pauseLocationUpdatesAutomatically:NO
+                            showBackgroundLocationIndicator:NO
+                                               activityType:CLActivityTypeOther
+                             allowBackgroundLocationUpdates:NO
+                                              resultHandler:^(CLLocation * _Nullable location) {
+  }
+                                               errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
+    
+  }];
+  OCMVerify(never(), [_mockLocationManager setAllowsBackgroundLocationUpdates:YES]);
 }
 
 - (void)testKeepLocationManagerSettingsWhenRequestingCurrentPosition {
@@ -283,14 +287,14 @@ - (void)testKeepLocationManagerSettingsWhenRequestingCurrentPosition {
       ._andReturn([NSNumber numberWithBool:YES]);
   }
   [geolocationHandlerMock startListeningWithDesiredAccuracy: kCLLocationAccuracyBest
-                                          distanceFilter:0
-                       pauseLocationUpdatesAutomatically:NO
-                         showBackgroundLocationIndicator:YES
-                                            activityType:CLActivityTypeOther
-                          allowBackgroundLocationUpdates:YES
-                                           resultHandler:^(CLLocation * _Nullable location) {
+                                             distanceFilter:0
+                          pauseLocationUpdatesAutomatically:NO
+                            showBackgroundLocationIndicator:YES
+                                               activityType:CLActivityTypeOther
+                             allowBackgroundLocationUpdates:YES
+                                              resultHandler:^(CLLocation * _Nullable location) {
   }
-                                            errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
+                                               errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
     
   }];
   OCMVerify([_mockLocationManager setAllowsBackgroundLocationUpdates:YES]);
@@ -306,4 +310,29 @@ - (void)testKeepLocationManagerSettingsWhenRequestingCurrentPosition {
   }
 }
 
+- (void)testKeepLocationManagerSettingsWhenRequestingCurrentPosition1 {
+  [_geolocationHandler startListeningWithDesiredAccuracy:kCLLocationAccuracyThreeKilometers
+                                          distanceFilter:kCLLocationAccuracyThreeKilometers
+                       pauseLocationUpdatesAutomatically:NO
+                         showBackgroundLocationIndicator:YES
+                                            activityType:CLActivityTypeOther
+                          allowBackgroundLocationUpdates:YES
+                                           resultHandler:^(CLLocation * _Nullable location) {
+  }
+                                            errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {
+    
+  }];
+  OCMVerify([_mockLocationManager setDesiredAccuracy:kCLLocationAccuracyThreeKilometers]);
+  OCMVerify([_mockLocationManager setDistanceFilter:kCLLocationAccuracyThreeKilometers]);
+  
+  [_geolocationHandler requestPositionWithDesiredAccuracy:kCLLocationAccuracyBest
+                                            resultHandler:^(CLLocation * _Nullable location) {}
+                                             errorHandler:^(NSString * _Nonnull errorCode, NSString * _Nonnull errorDescription) {}];
+  OCMVerify([_mockOneTimeLocationManager setDesiredAccuracy:kCLLocationAccuracyBest]);
+  OCMVerify([_mockOneTimeLocationManager setDistanceFilter:kCLDistanceFilterNone]);
+  
+  OCMVerify(never(), [_mockLocationManager setDesiredAccuracy:kCLLocationAccuracyBest]);
+  OCMVerify(never(), [_mockLocationManager setDistanceFilter:kCLDistanceFilterNone]);
+}
+
 @end
diff --git a/geolocator_apple/example/ios/RunnerTests/GeolocatorPluginTests.m b/geolocator_apple/example/ios/RunnerTests/GeolocatorPluginTests.m
index c4e9cf4a..3c661293 100644
--- a/geolocator_apple/example/ios/RunnerTests/GeolocatorPluginTests.m
+++ b/geolocator_apple/example/ios/RunnerTests/GeolocatorPluginTests.m
@@ -311,56 +311,20 @@ - (void)testRequestTemporaryFullAccuracyWithInvalidArgument {
 #pragma mark - Test open setting related methods
 
 - (void)testOpenAppSettings {
-  if (@available(iOS 10, *))
-  {
-    id mockApplication = OCMClassMock([UIApplication class]);
-    OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
-                             options:@{}
-                   completionHandler:([OCMArg invokeBlockWithArgs:@(YES), nil])]);
-    OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
-    
-      
-    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openAppSettings"
-                                                                arguments:@{}];
-    
-    XCTestExpectation *expectation = [self expectationWithDescription:@"openAppSettings should return yes."];
-    GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
-    [plugin handleMethodCall:call result:^(id  _Nullable result) {
-      XCTAssertTrue(result);
-      [expectation fulfill];
-    }];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    return;
-  }
-  
-  if (@available(iOS 8, *)) {
-    id mockApplication = OCMClassMock([UIApplication class]);
-    OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]).andReturn(YES);
-    OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
-    
-      
-    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openAppSettings"
-                                                                arguments:@{}];
-    
-    XCTestExpectation *expectation = [self expectationWithDescription:@"openAppSettings should return yes."];
-    GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
-    [plugin handleMethodCall:call result:^(id  _Nullable result) {
-      XCTAssertTrue(result);
-      [expectation fulfill];
-    }];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    return;
-  }
-  
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
+                           options:@{}
+                 completionHandler:([OCMArg invokeBlockWithArgs:@(YES), nil])]);
+  OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
+
+
   FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openAppSettings"
                                                               arguments:@{}];
   
   XCTestExpectation *expectation = [self expectationWithDescription:@"openAppSettings should return yes."];
   GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
   [plugin handleMethodCall:call result:^(id  _Nullable result) {
-    XCTAssertFalse(result);
+    XCTAssertTrue(result);
     [expectation fulfill];
   }];
   
@@ -369,61 +333,24 @@ - (void)testOpenAppSettings {
 }
 
 - (void)testOpenLocationSettings {
-  if (@available(iOS 10, *))
-  {
-    id mockApplication = OCMClassMock([UIApplication class]);
-    OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
-                             options:@{}
-                   completionHandler:([OCMArg invokeBlockWithArgs:@(YES), nil])]);
-    OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
-    
-      
-    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openLocationSettings"
-                                                                arguments:@{}];
-    
-    XCTestExpectation *expectation = [self expectationWithDescription:@"openLocationSettings should return yes."];
-    GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
-    [plugin handleMethodCall:call result:^(id  _Nullable result) {
-      XCTAssertTrue(result);
-      [expectation fulfill];
-    }];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    return;
-  }
-  
-  if (@available(iOS 8, *)) {
-    id mockApplication = OCMClassMock([UIApplication class]);
-    OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]]).andReturn(YES);
-    OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
-    
-      
-    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openLocationSettings"
-                                                                arguments:@{}];
-    
-    XCTestExpectation *expectation = [self expectationWithDescription:@"openLocationSettings should return yes."];
-    GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
-    [plugin handleMethodCall:call result:^(id  _Nullable result) {
-      XCTAssertTrue(result);
-      [expectation fulfill];
-    }];
-    
-    [self waitForExpectationsWithTimeout:5.0 handler:nil];
-    return;
-  }
-  
+  id mockApplication = OCMClassMock([UIApplication class]);
+  OCMStub([mockApplication openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]
+                           options:@{}
+                 completionHandler:([OCMArg invokeBlockWithArgs:@(YES), nil])]);
+  OCMStub(ClassMethod([mockApplication sharedApplication])).andReturn(mockApplication);
+
+
   FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"openLocationSettings"
                                                               arguments:@{}];
   
   XCTestExpectation *expectation = [self expectationWithDescription:@"openLocationSettings should return yes."];
   GeolocatorPlugin *plugin = [[GeolocatorPlugin alloc] init];
   [plugin handleMethodCall:call result:^(id  _Nullable result) {
-    XCTAssertFalse(result);
+    XCTAssertTrue(result);
     [expectation fulfill];
   }];
   
   [self waitForExpectationsWithTimeout:5.0 handler:nil];
-  return;
 }
 
 @end
diff --git a/geolocator_apple/example/lib/main.dart b/geolocator_apple/example/lib/main.dart
index 442e0b2c..154ac6f2 100644
--- a/geolocator_apple/example/lib/main.dart
+++ b/geolocator_apple/example/lib/main.dart
@@ -18,7 +18,7 @@ void main() {
 /// Example [Widget] showing the functionalities of the geolocator plugin
 class GeolocatorWidget extends StatefulWidget {
   /// Creates a new GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  const GeolocatorWidget({super.key});
 
   /// Utility method to create a page with the Baseflow templating.
   static ExamplePage createPage() {
diff --git a/geolocator_apple/example/macos/Podfile b/geolocator_apple/example/macos/Podfile
index dade8dfa..049abe29 100644
--- a/geolocator_apple/example/macos/Podfile
+++ b/geolocator_apple/example/macos/Podfile
@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '10.14'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/geolocator_apple/example/macos/Runner.xcodeproj/project.pbxproj b/geolocator_apple/example/macos/Runner.xcodeproj/project.pbxproj
index 64c8f58a..8f53c70d 100644
--- a/geolocator_apple/example/macos/Runner.xcodeproj/project.pbxproj
+++ b/geolocator_apple/example/macos/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -27,6 +27,7 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -80,6 +81,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				01F3E8EC8133251A55B00508 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -184,7 +186,6 @@
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				2C98148FAA5AE9EAADACE6DC /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -192,6 +193,9 @@
 				33CC11202044C79F0003C045 /* PBXTargetDependency */,
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 33CC10ED2044A3C60003C045 /* geolocator_apple_example.app */;
 			productType = "com.apple.product-type.application";
@@ -203,7 +207,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -231,6 +235,9 @@
 				Base,
 			);
 			mainGroup = 33CC10E42044A3C60003C045;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -276,25 +283,9 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		2C98148FAA5AE9EAADACE6DC /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -404,7 +395,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -483,7 +474,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -530,7 +521,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -627,6 +618,20 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 33CC10E52044A3C60003C045 /* Project object */;
 }
diff --git a/geolocator_apple/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/geolocator_apple/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 1ab37cfb..3584ba91 100644
--- a/geolocator_apple/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/geolocator_apple/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "&quot;$FLUTTER_ROOT&quot;/packages/flutter_tools/bin/macos_assemble.sh prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+                     BuildableName = "geolocator_apple_example.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -48,6 +66,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/geolocator_apple/example/macos/Runner/AppDelegate.swift b/geolocator_apple/example/macos/Runner/AppDelegate.swift
index d53ef643..b3c17614 100644
--- a/geolocator_apple/example/macos/Runner/AppDelegate.swift
+++ b/geolocator_apple/example/macos/Runner/AppDelegate.swift
@@ -1,9 +1,13 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }
diff --git a/geolocator_apple/example/pubspec.yaml b/geolocator_apple/example/pubspec.yaml
index bdaed10f..a891083b 100644
--- a/geolocator_apple/example/pubspec.yaml
+++ b/geolocator_apple/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the geolocator_ios plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
diff --git a/geolocator_apple/ios/Assets/.gitkeep b/geolocator_apple/ios/Assets/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/geolocator_apple/lib/src/types/apple_settings.dart b/geolocator_apple/lib/src/types/apple_settings.dart
index e954df2a..b265ca7d 100644
--- a/geolocator_apple/lib/src/types/apple_settings.dart
+++ b/geolocator_apple/lib/src/types/apple_settings.dart
@@ -13,16 +13,12 @@ class AppleSettings extends LocationSettings {
   AppleSettings({
     this.pauseLocationUpdatesAutomatically = false,
     this.activityType = ActivityType.other,
-    LocationAccuracy accuracy = LocationAccuracy.best,
-    int distanceFilter = 0,
-    Duration? timeLimit,
+    super.accuracy,
+    super.distanceFilter,
+    super.timeLimit,
     this.showBackgroundLocationIndicator = false,
     this.allowBackgroundLocationUpdates = true,
-  }) : super(
-          accuracy: accuracy,
-          distanceFilter: distanceFilter,
-          timeLimit: timeLimit,
-        );
+  });
 
   /// Allows the location manager to pause updates to improve battery life
   /// on the target device without sacrificing location data.
diff --git a/geolocator_apple/macos/Classes/Constants/ErrorCodes.h b/geolocator_apple/macos/Classes/Constants/ErrorCodes.h
deleted file mode 120000
index 99520f68..00000000
--- a/geolocator_apple/macos/Classes/Constants/ErrorCodes.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Constants/ErrorCodes.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Constants/ErrorCodes.m b/geolocator_apple/macos/Classes/Constants/ErrorCodes.m
deleted file mode 120000
index 2fa55bbe..00000000
--- a/geolocator_apple/macos/Classes/Constants/ErrorCodes.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Constants/ErrorCodes.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/GeolocatorPlugin.h b/geolocator_apple/macos/Classes/GeolocatorPlugin.h
deleted file mode 120000
index 4ecded71..00000000
--- a/geolocator_apple/macos/Classes/GeolocatorPlugin.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ios/Classes/GeolocatorPlugin.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/GeolocatorPlugin.m b/geolocator_apple/macos/Classes/GeolocatorPlugin.m
deleted file mode 120000
index 9d86fa96..00000000
--- a/geolocator_apple/macos/Classes/GeolocatorPlugin.m
+++ /dev/null
@@ -1 +0,0 @@
-../../ios/Classes/GeolocatorPlugin.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/GeolocatorPlugin.modulemap b/geolocator_apple/macos/Classes/GeolocatorPlugin.modulemap
deleted file mode 120000
index 8f52d8ce..00000000
--- a/geolocator_apple/macos/Classes/GeolocatorPlugin.modulemap
+++ /dev/null
@@ -1 +0,0 @@
-../../ios/Classes/GeolocatorPlugin.modulemap
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/GeolocatorPlugin_Test.h b/geolocator_apple/macos/Classes/GeolocatorPlugin_Test.h
deleted file mode 120000
index abd3ce2d..00000000
--- a/geolocator_apple/macos/Classes/GeolocatorPlugin_Test.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ios/Classes/GeolocatorPlugin_Test.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.h b/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.h
deleted file mode 120000
index becfc644..00000000
--- a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/GeolocationHandler.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.m b/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.m
deleted file mode 120000
index b3ade741..00000000
--- a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/GeolocationHandler.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler_Test.h b/geolocator_apple/macos/Classes/Handlers/GeolocationHandler_Test.h
deleted file mode 120000
index 89a2a556..00000000
--- a/geolocator_apple/macos/Classes/Handlers/GeolocationHandler_Test.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/GeolocationHandler_Test.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.h b/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.h
deleted file mode 120000
index 39eca8dc..00000000
--- a/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/LocationAccuracyHandler.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.m b/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.m
deleted file mode 120000
index 1c17a993..00000000
--- a/geolocator_apple/macos/Classes/Handlers/LocationAccuracyHandler.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/LocationAccuracyHandler.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.h b/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.h
deleted file mode 120000
index 4c24dc07..00000000
--- a/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/LocationServiceStreamHandler.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.m b/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.m
deleted file mode 120000
index e37b74c8..00000000
--- a/geolocator_apple/macos/Classes/Handlers/LocationServiceStreamHandler.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/LocationServiceStreamHandler.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/PermissionHandler.h b/geolocator_apple/macos/Classes/Handlers/PermissionHandler.h
deleted file mode 120000
index f377b26b..00000000
--- a/geolocator_apple/macos/Classes/Handlers/PermissionHandler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/PermissionHandler.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/PermissionHandler.m b/geolocator_apple/macos/Classes/Handlers/PermissionHandler.m
deleted file mode 120000
index bd615c5c..00000000
--- a/geolocator_apple/macos/Classes/Handlers/PermissionHandler.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/PermissionHandler.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.h b/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.h
deleted file mode 120000
index 1271d734..00000000
--- a/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/PositionStreamHandler.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.m b/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.m
deleted file mode 120000
index a7097797..00000000
--- a/geolocator_apple/macos/Classes/Handlers/PositionStreamHandler.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Handlers/PositionStreamHandler.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.h b/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.h
deleted file mode 120000
index 47819f32..00000000
--- a/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/ActivityTypeMapper.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.m b/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.m
deleted file mode 120000
index 27aea756..00000000
--- a/geolocator_apple/macos/Classes/Utils/ActivityTypeMapper.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/ActivityTypeMapper.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.h b/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.h
deleted file mode 120000
index 2a8cb448..00000000
--- a/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/AuthorizationStatusMapper.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.m b/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.m
deleted file mode 120000
index a654a9f3..00000000
--- a/geolocator_apple/macos/Classes/Utils/AuthorizationStatusMapper.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/AuthorizationStatusMapper.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.h b/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.h
deleted file mode 120000
index d002d20c..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationAccuracyMapper.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.m b/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.m
deleted file mode 120000
index c35e7740..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationAccuracyMapper.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationAccuracyMapper.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.h b/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.h
deleted file mode 120000
index 8c4b2839..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationDistanceMapper.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.m b/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.m
deleted file mode 120000
index 39ddf65f..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationDistanceMapper.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationDistanceMapper.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationMapper.h b/geolocator_apple/macos/Classes/Utils/LocationMapper.h
deleted file mode 120000
index 0fed8717..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationMapper.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationMapper.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/LocationMapper.m b/geolocator_apple/macos/Classes/Utils/LocationMapper.m
deleted file mode 120000
index d75781ba..00000000
--- a/geolocator_apple/macos/Classes/Utils/LocationMapper.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/LocationMapper.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/PermissionUtils.h b/geolocator_apple/macos/Classes/Utils/PermissionUtils.h
deleted file mode 120000
index 85548ae4..00000000
--- a/geolocator_apple/macos/Classes/Utils/PermissionUtils.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/PermissionUtils.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/PermissionUtils.m b/geolocator_apple/macos/Classes/Utils/PermissionUtils.m
deleted file mode 120000
index 16dc2fb4..00000000
--- a/geolocator_apple/macos/Classes/Utils/PermissionUtils.m
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/PermissionUtils.m
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/Utils/ServiceStatus.h b/geolocator_apple/macos/Classes/Utils/ServiceStatus.h
deleted file mode 120000
index 45f7b557..00000000
--- a/geolocator_apple/macos/Classes/Utils/ServiceStatus.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../ios/Classes/Utils/ServiceStatus.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/Classes/geolocator-umbrella.h b/geolocator_apple/macos/Classes/geolocator-umbrella.h
deleted file mode 120000
index f23b55c7..00000000
--- a/geolocator_apple/macos/Classes/geolocator-umbrella.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ios/Classes/geolocator-umbrella.h
\ No newline at end of file
diff --git a/geolocator_apple/macos/geolocator_apple.podspec b/geolocator_apple/macos/geolocator_apple.podspec
deleted file mode 100644
index 6a91c2a7..00000000
--- a/geolocator_apple/macos/geolocator_apple.podspec
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
-#
-Pod::Spec.new do |s|
-  s.name             = 'geolocator_apple'
-  s.version          = '1.2.0'
-  s.summary          = 'Geolocation macOS plugin for Flutter.'
-  s.description      = <<-DESC
-  Geolocation macOS plugin for Flutter. This plugin provides the Apple implementation for the geolocator plugin.
-                       DESC
-  s.homepage         = 'http://github.com/baseflow/flutter-geolocator'
-  s.license          = { :type => 'MIT', :file => '../LICENSE' }
-  s.author           = { 'Baseflow' => 'hello@baseflow.com' }
-  s.source           = { :http => 'https://github.com/baseflow/flutter-geolocator/tree/master/' }
-  s.source_files = 'Classes/**/*.{h,m}'
-  s.public_header_files = 'Classes/**/*.h'
-  s.module_map = 'Classes/GeolocatorPlugin.modulemap'
-  s.dependency 'FlutterMacOS'
-  s.platform = :osx, '10.11' 
-  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
-end
diff --git a/geolocator_apple/pubspec.yaml b/geolocator_apple/pubspec.yaml
index f3bbe3e7..15956f4b 100644
--- a/geolocator_apple/pubspec.yaml
+++ b/geolocator_apple/pubspec.yaml
@@ -2,10 +2,10 @@ name: geolocator_apple
 description: Geolocation Apple plugin for Flutter. This plugin provides the Apple implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_apple
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 2.3.7
+version: 2.3.14
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
+  sdk: ^3.5.0
   flutter: ">=2.8.0"
 
 flutter:
@@ -15,9 +15,11 @@ flutter:
       ios:
         pluginClass: GeolocatorPlugin
         dartPluginClass: GeolocatorApple
+        sharedDarwinSource: true
       macos:
         pluginClass: GeolocatorPlugin
         dartPluginClass: GeolocatorApple
+        sharedDarwinSource: true
 
 dependencies:
   flutter:
@@ -28,6 +30,6 @@ dev_dependencies:
   async: ^2.8.2
   flutter_test:
     sdk: flutter
-  flutter_lints: ">=3.0.1 <5.0.0"
+  flutter_lints: ">=3.0.1 <6.0.0"
   mockito: ^5.2.0
   plugin_platform_interface: ^2.1.2
diff --git a/geolocator_linux/CHANGELOG.md b/geolocator_linux/CHANGELOG.md
index ab4a8481..081c430c 100644
--- a/geolocator_linux/CHANGELOG.md
+++ b/geolocator_linux/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.2.3
+
+- Updates dependency on flutter_lints to version 5.0.0.
+
+## 0.2.2
+
+- Updates dart sdk to `sdk: ^3.5.0`
+- Fixes analyzer issues
+
 ## 0.2.1
 
 - Updates dependency on package_info_plus to version 8.0.0.
diff --git a/geolocator_linux/example/lib/main.dart b/geolocator_linux/example/lib/main.dart
index 780d6a0f..599d4f39 100644
--- a/geolocator_linux/example/lib/main.dart
+++ b/geolocator_linux/example/lib/main.dart
@@ -21,7 +21,7 @@ void main() {
 /// Example [Widget] showing the functionalities of the geolocator plugin
 class GeolocatorWidget extends StatefulWidget {
   /// Create a GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  const GeolocatorWidget({super.key});
 
   /// Utility method to create a page with the Baseflow templating.
   static ExamplePage createPage() {
diff --git a/geolocator_linux/example/pubspec.yaml b/geolocator_linux/example/pubspec.yaml
index bb0d1c19..0c6d26f0 100644
--- a/geolocator_linux/example/pubspec.yaml
+++ b/geolocator_linux/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the geolocator_linux plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
@@ -33,7 +33,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.1
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/geolocator_linux/lib/src/geoclue_x.dart b/geolocator_linux/lib/src/geoclue_x.dart
index 8ada4947..4f45fa85 100644
--- a/geolocator_linux/lib/src/geoclue_x.dart
+++ b/geolocator_linux/lib/src/geoclue_x.dart
@@ -45,8 +45,6 @@ extension GeoClueLocationAccuracy on LocationAccuracy {
       case LocationAccuracy.best:
       case LocationAccuracy.bestForNavigation:
         return GeoClueAccuracyLevel.exact;
-      default:
-        return GeoClueAccuracyLevel.none;
     }
   }
 }
diff --git a/geolocator_linux/lib/src/geolocator_gnome.dart b/geolocator_linux/lib/src/geolocator_gnome.dart
index ed238b28..05cc48fe 100644
--- a/geolocator_linux/lib/src/geolocator_gnome.dart
+++ b/geolocator_linux/lib/src/geolocator_gnome.dart
@@ -1,4 +1,3 @@
-import 'package:geoclue/geoclue.dart';
 import 'package:geolocator_platform_interface/geolocator_platform_interface.dart';
 import 'package:gsettings/gsettings.dart';
 import 'package:dbus/dbus.dart';
@@ -6,9 +5,8 @@ import 'package:dbus/dbus.dart';
 import 'geolocator_linux.dart';
 
 class GeolocatorGnome extends GeolocatorLinux {
-  GeolocatorGnome(GeoClueManager manager, {GSettings? settings})
-      : _settings = settings ?? GSettings('org.gnome.system.location'),
-        super(manager);
+  GeolocatorGnome(super.manager, {GSettings? settings})
+      : _settings = settings ?? GSettings('org.gnome.system.location');
 
   final GSettings _settings;
 
diff --git a/geolocator_linux/pubspec.yaml b/geolocator_linux/pubspec.yaml
index 897f9026..c5e83aa6 100644
--- a/geolocator_linux/pubspec.yaml
+++ b/geolocator_linux/pubspec.yaml
@@ -3,10 +3,10 @@ description: Geolocation Linux plugin for Flutter. This plugin provides the
   Linux implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_linux
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 0.2.1
+version: 0.2.3
 
 environment:
-  sdk: '>=2.15.0 <4.0.0'
+  sdk: ^3.5.0
   flutter: ">=2.8.0"
 
 flutter:
diff --git a/geolocator_platform_interface/CHANGELOG.md b/geolocator_platform_interface/CHANGELOG.md
index 245e8e0a..87b4da84 100644
--- a/geolocator_platform_interface/CHANGELOG.md
+++ b/geolocator_platform_interface/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 4.2.6
+
+- Updates documentation `isMocked` to bring it in line with the functionality. `isMocked` for iOS 15 and higher depends on the result from isSimulatedBySoftware.
+
+## 4.2.5
+
+- Updates dart sdk to `>3.5.0`
+
 ## 4.2.4
 
 - Correctly handle integer-like numbers when decoding `Position` from JSON.
diff --git a/geolocator_platform_interface/lib/src/models/position.dart b/geolocator_platform_interface/lib/src/models/position.dart
index 23e08e8b..2121bb1d 100644
--- a/geolocator_platform_interface/lib/src/models/position.dart
+++ b/geolocator_platform_interface/lib/src/models/position.dart
@@ -85,7 +85,9 @@ class Position {
   /// Will be true on Android (starting from API lvl 18) when the location came
   /// from the mocked provider.
   ///
-  /// On iOS this value will always be false.
+  /// Will be true on iOS 15 and higher when flag isSimulatedBySoftware is true (otherwise false).
+  ///
+  /// When not available the default value is false.
   final bool isMocked;
 
   @override
diff --git a/geolocator_platform_interface/pubspec.yaml b/geolocator_platform_interface/pubspec.yaml
index 736507cc..a4a92ce4 100644
--- a/geolocator_platform_interface/pubspec.yaml
+++ b/geolocator_platform_interface/pubspec.yaml
@@ -3,7 +3,8 @@ description: A common platform interface for the geolocator plugin.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_platform_interface
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 4.2.4
+version: 4.2.6
+
 
 dependencies:
   flutter:
@@ -21,5 +22,5 @@ dev_dependencies:
   mockito: ^5.4.2
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
+  sdk: ^3.5.0
   flutter: ">=2.8.0"
diff --git a/geolocator_web/CHANGELOG.md b/geolocator_web/CHANGELOG.md
index 6f60bf79..70dd201b 100644
--- a/geolocator_web/CHANGELOG.md
+++ b/geolocator_web/CHANGELOG.md
@@ -1,4 +1,13 @@
-## 4.1.1
+## 4.1.3
+
+- Bump `flutter_lints` to version 5.0.0
+
+## 4.1.2
+
+- Updates dart SDK to `sdk: ^3.5.0`
+- Fixes analyzer issues
+
+# 4.1.1
 
 - Exposes the `WebSettings` class as a public type.
 
diff --git a/geolocator_web/example/lib/main.dart b/geolocator_web/example/lib/main.dart
index 5ae3467c..400a7684 100644
--- a/geolocator_web/example/lib/main.dart
+++ b/geolocator_web/example/lib/main.dart
@@ -21,7 +21,7 @@ void main() {
 /// Example [Widget] showing the functionalities of the geolocator plugin
 class GeolocatorWidget extends StatefulWidget {
   /// Create a GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  const GeolocatorWidget({super.key});
 
   /// Utility method to create a page with the Baseflow templating.
   static ExamplePage createPage() {
diff --git a/geolocator_web/example/pubspec.yaml b/geolocator_web/example/pubspec.yaml
index e0da5627..eec31e0c 100644
--- a/geolocator_web/example/pubspec.yaml
+++ b/geolocator_web/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the geolocator plugin on the web platform.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0-0 <3.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
@@ -32,7 +32,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^3.0.1
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/geolocator_web/pubspec.yaml b/geolocator_web/pubspec.yaml
index c3b8dde2..71062b5e 100644
--- a/geolocator_web/pubspec.yaml
+++ b/geolocator_web/pubspec.yaml
@@ -2,7 +2,7 @@ name: geolocator_web
 description: Official web implementation of the geolocator plugin.
 repository: https://github.com/baseflow/flutter-geolocator/tree/main/geolocator_web
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 4.1.1
+version: 4.1.3
 
 flutter:
   plugin:
@@ -28,5 +28,5 @@ dev_dependencies:
   mockito: ^5.4.0
 
 environment:
-  sdk: ">=3.4.0 <4.0.0"
+  sdk: ^3.5.0
   flutter: ">=3.16.0"
diff --git a/geolocator_windows/CHANGELOG.md b/geolocator_windows/CHANGELOG.md
index 7fd8ebe6..ba88e95a 100644
--- a/geolocator_windows/CHANGELOG.md
+++ b/geolocator_windows/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 0.2.5
+
+- Bump `flutter_lints` to version 5.0.0
+
+## 0.2.4
+
+* Updates dart SDk to `sdk: ^3.5.0`
+* Fixed analyzzer issues example project
+
 ## 0.2.3
 
 * Fixes crash under Windows when RequestAcess is called while the Geolocation Service is disabled. (#1455)
diff --git a/geolocator_windows/example/lib/main.dart b/geolocator_windows/example/lib/main.dart
index 2e09b1da..d5520fc8 100644
--- a/geolocator_windows/example/lib/main.dart
+++ b/geolocator_windows/example/lib/main.dart
@@ -16,7 +16,7 @@ void main() {
 /// Example [Widget] showing the functionalities of the geolocator plugin
 class GeolocatorWidget extends StatefulWidget {
   /// Creates a new GeolocatorWidget.
-  const GeolocatorWidget({Key? key}) : super(key: key);
+  const GeolocatorWidget({super.key});
 
   /// Utility method to create a page with the Baseflow templating.
   static ExamplePage createPage() {
diff --git a/geolocator_windows/example/pubspec.yaml b/geolocator_windows/example/pubspec.yaml
index 90fa2905..37856a74 100644
--- a/geolocator_windows/example/pubspec.yaml
+++ b/geolocator_windows/example/pubspec.yaml
@@ -6,7 +6,7 @@ description: Demonstrates how to use the geolocator_windows plugin.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ^3.5.0
 
 dependencies:
   baseflow_plugin_template: ^2.1.2
@@ -33,7 +33,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.2
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/geolocator_windows/pubspec.yaml b/geolocator_windows/pubspec.yaml
index 5ae18655..0b58b73e 100644
--- a/geolocator_windows/pubspec.yaml
+++ b/geolocator_windows/pubspec.yaml
@@ -2,10 +2,10 @@ name: geolocator_windows
 description: Geolocation Windows plugin for Flutter. This plugin provides the Windows implementation for the geolocator.
 repository: https://github.com/baseflow/flutter-geolocators
 issue_tracker: https://github.com/baseflow/flutter-geolocator/issues?q=is%3Aissue+is%3Aopen
-version: 0.2.3
+version: 0.2.5
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
+  sdk: ^3.5.0
   flutter: ">=2.8.0"
 
 flutter: