Android updates (#1641)

* Android updates

* Format Android

* fixed analyzer issues

* update

* update

* update settings

* change java version form 11 to 17

* update

* update

* cleanup

* cleanup

* cleanup

* Update build.gradle

* Update build.gradle

* update

* update

* Update CHANGELOG.md

* Update build.gradle

* Update build.gradle

* update

* reverts breaking changes when you use Flutter 3.27.0

* updated build script

* Temporary omit deprecation warnings.

Author: TimHoogstrate

.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

geolocator_android/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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.

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'

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 {

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
+

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"

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,27 +154,27 @@ 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'
                         : _positionStreamSubscription!.isPaused
                             ? '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),
                   ),
                 ],
               ),

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:

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,
         );
 

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).

geolocator_android/lib/src/types/foreground_settings.dart

@@ -119,6 +119,8 @@ class ForegroundNotificationConfig {
       'notificationText': notificationText,
       'notificationChannelName': notificationChannelName,
       'setOngoing': setOngoing,
+      // Temporary ignored for release 4.6.1 (remove in future versions)
+      // ignore: deprecated_member_use
       'color': color?.value,
     };
   }

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: 4.6.2
 
 environment:
-  sdk: ">=2.15.0 <4.0.0"
-  flutter: ">=2.8.0"
+  sdk: ^3.5.0
+  flutter: ">=2.17.0"
 
 flutter:
   plugin:

geolocator_android/test/geolocator_android_test.dart

@@ -1511,6 +1511,8 @@ void main() {
         );
         expect(
           jsonMap['foregroundNotificationConfig']['color'],
+          // Temporary ignored for release 4.6.1 (remove in future versions)
+          // ignore: deprecated_member_use
           settings.foregroundNotificationConfig!.color!.value,
         );
       });