Federation (#800)

* Federate iOS and Android platforms

* Fix geolocator_apple workflow

* Fix geolocator_apple workflow

Author: mvanbeusekom

.github/workflows/geolocator_android.yaml

@@ -108,38 +108,3 @@ jobs:
       - name: Run Android build
         run: flutter build apk --release
         working-directory: ${{env.example-directory}}
-       
-  tests:
-    name: Unit-tests
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    env:
-      source-directory: ./geolocator_android
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      
-      # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
-        with:
-          channel: 'stable'
-
-      # Download all Flutter packages
-      - name: Download dependencies
-        run: flutter pub get
-        working-directory: ${{env.source-directory}}
-      
-      # Run all unit-tests with code coverage
-      - name: Run unit tests
-        run: flutter test --coverage
-        working-directory: ${{env.source-directory}}
-
-      # Upload code coverage information
-      - uses: codecov/codecov-action@v1
-        with:
-          file: ${{env.source-directory}}/coverage/lcov.info # optional
-          name: Geolocator (App Facing Package) # optional
-          fail_ci_if_error: true

.github/workflows/geolocator_ios.yaml renamed to .github/workflows/geolocator_apple.yaml

@@ -1,18 +1,18 @@
 # This is a basic workflow to help you get started with Actions
 
-name: geolocator_ios
+name: geolocator_apple
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the develop branch
 on:
   push:
     branches: [ master, next ]
     paths:
-    - 'geolocator_ios/**'
+    - 'geolocator_apple/**'
   pull_request:
     branches: [ master, next ]
     paths:
-    - 'geolocator_ios/**'
+    - 'geolocator_apple/**'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      source-directory: ./geolocator_ios 
+      source-directory: ./geolocator_apple 
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      source-directory: ./geolocator_ios
+      source-directory: ./geolocator_apple
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -81,8 +81,8 @@ jobs:
     runs-on: macos-latest
 
     env:
-      source-directory: ./geolocator_ios 
-      example-directory: ./geolocator_ios/example
+      source-directory: ./geolocator_apple 
+      example-directory: ./geolocator_apple/example
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -103,38 +103,3 @@ jobs:
       - name: Run iOS build
         run: flutter build ios --release --no-codesign
         working-directory: ${{env.example-directory}}
-
-  tests:
-    name: Unit-tests
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    env:
-      source-directory: ./geolocator_ios 
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      
-      # Make sure the stable version of Flutter is available
-      - uses: subosito/flutter-action@v1
-        with:
-          channel: 'stable'
-
-      # Download all Flutter packages
-      - name: Download dependencies
-        run: flutter pub get
-        working-directory: ${{env.source-directory}}
-      
-      # Run all unit-tests with code coverage
-      - name: Run unit tests
-        run: flutter test --coverage
-        working-directory: ${{env.source-directory}}
-
-      # Upload code coverage information
-      - uses: codecov/codecov-action@v1
-        with:
-          file: ${{env.source-directory}}/coverage/lcov.info # optional
-          name: Geolocator (App Facing Package) # optional
-          fail_ci_if_error: true

geolocator_android/README.md

@@ -6,7 +6,7 @@ The official Android implementation of the [geolocator](https://pub.dev/packages
 
 ## Usage
 
-Since version 8.0.0 of the [geolocator](https://pub.dev/packages/geolocator) plugin this is the endorsed Android implementation. This means it will automatically be added to your dependencies when you depend on `geolocator: ^8.0.0` in your applications pubspec.yaml.
+Since version 7.4.0 of the [geolocator](https://pub.dev/packages/geolocator) plugin this is the endorsed Android implementation. This means it will automatically be added to your dependencies when you depend on `geolocator: ^7.4.0` in your applications pubspec.yaml.
 
 More detailed instructions on using the API can be found in the [README.md](../geolocator/README.md) of the [geolocator](https://pub.dev/packages/geolocator) package.
 

geolocator_android/example/README.md

@@ -1,6 +1,6 @@
-# geolocator_example
+# geolocator_android_example
 
-Demonstrates how to use the geolocator plugin.
+Demonstrates how to use the geolocator_android plugin.
 
 ## Getting Started
 

geolocator_android/example/lib/main.dart

@@ -3,7 +3,7 @@ import 'dart:io' show Platform;
 
 import 'package:baseflow_plugin_template/baseflow_plugin_template.dart';
 import 'package:flutter/material.dart';
-import 'package:geolocator_android/geolocator.dart';
+import 'package:geolocator_platform_interface/geolocator_platform_interface.dart';
 
 /// Defines the main theme color.
 final MaterialColor themeMaterialColor =
@@ -37,7 +37,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
       'Permission denied forever.';
   static const String _kPermissionGrantedMessage = 'Permission granted.';
 
-  final GeolocatorPlatform _geolocatorPlatform = GeolocatorPlatform.instance;
+  final GeolocatorPlatform geolocatorAndroid = GeolocatorPlatform.instance;
   final List<_PositionItem> _positionItems = <_PositionItem>[];
   StreamSubscription<Position>? _positionStreamSubscription;
   StreamSubscription<ServiceStatus>? _serviceStatusStreamSubscription;
@@ -186,7 +186,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
       return;
     }
 
-    final position = await _geolocatorPlatform.getCurrentPosition();
+    final position = await geolocatorAndroid.getCurrentPosition();
     _updatePositionList(
       _PositionItemType.position,
       position.toString(),
@@ -198,7 +198,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
     LocationPermission permission;
 
     // Test if location services are enabled.
-    serviceEnabled = await _geolocatorPlatform.isLocationServiceEnabled();
+    serviceEnabled = await geolocatorAndroid.isLocationServiceEnabled();
     if (!serviceEnabled) {
       // Location services are not enabled don't continue
       // accessing the position and request users of the
@@ -211,9 +211,9 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
       return false;
     }
 
-    permission = await _geolocatorPlatform.checkPermission();
+    permission = await geolocatorAndroid.checkPermission();
     if (permission == LocationPermission.denied) {
-      permission = await _geolocatorPlatform.requestPermission();
+      permission = await geolocatorAndroid.requestPermission();
       if (permission == LocationPermission.denied) {
         // Permissions are denied, next time you could try
         // requesting permissions again (this is also where
@@ -262,7 +262,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
 
   void _toggleServiceStatusStream() {
     if (_serviceStatusStreamSubscription == null) {
-      final serviceStatusStream = _geolocatorPlatform.getServiceStatusStream();
+      final serviceStatusStream = geolocatorAndroid.getServiceStatusStream();
       _serviceStatusStreamSubscription =
           serviceStatusStream.handleError((error) {
         _serviceStatusStreamSubscription?.cancel();
@@ -284,7 +284,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
 
   void _toggleListening() {
     if (_positionStreamSubscription == null) {
-      final positionStream = _geolocatorPlatform.getPositionStream();
+      final positionStream = geolocatorAndroid.getPositionStream();
       _positionStreamSubscription = positionStream.handleError((error) {
         _positionStreamSubscription?.cancel();
         _positionStreamSubscription = null;
@@ -327,7 +327,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
   }
 
   void _getLastKnownPosition() async {
-    final position = await _geolocatorPlatform.getLastKnownPosition();
+    final position = await geolocatorAndroid.getLastKnownPosition();
     if (position != null) {
       _updatePositionList(
         _PositionItemType.position,
@@ -342,12 +342,12 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
   }
 
   void _getLocationAccuracy() async {
-    final status = await _geolocatorPlatform.getLocationAccuracy();
+    final status = await geolocatorAndroid.getLocationAccuracy();
     _handleLocationAccuracyStatus(status);
   }
 
   void _requestTemporaryFullAccuracy() async {
-    final status = await _geolocatorPlatform.requestTemporaryFullAccuracy(
+    final status = await geolocatorAndroid.requestTemporaryFullAccuracy(
       purposeKey: "TemporaryPreciseAccuracy",
     );
     _handleLocationAccuracyStatus(status);
@@ -369,7 +369,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
   }
 
   void _openAppSettings() async {
-    final opened = await _geolocatorPlatform.openAppSettings();
+    final opened = await geolocatorAndroid.openAppSettings();
     String displayValue;
 
     if (opened) {
@@ -385,7 +385,7 @@ class _GeolocatorWidgetState extends State<GeolocatorWidget> {
   }
 
   void _openLocationSettings() async {
-    final opened = await _geolocatorPlatform.openLocationSettings();
+    final opened = await geolocatorAndroid.openLocationSettings();
     String displayValue;
 
     if (opened) {