[geolocator_apple] Add swift package manager compatibility (#1630)

* chore: added swift package manager compatibility

* chore: bump pubspec version

* chore: added ephemeral to gitignore

Author: alejandro-all-win-software

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

geolocator_apple/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.13
+
+* Adds Swift Package Manager compatibility.
+
 ## 2.3.12
 
 * Removed deprecated `-[UIApplication openURL:]` dead code.

geolocator_apple/ios/.gitignore renamed to geolocator_apple/darwin/.gitignore

@@ -5,21 +5,24 @@
 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
   s.homepage         = 'http://github.com/baseflow/flutter-geolocator'
   s.license          = { :type => 'MIT', :file => '../LICENSE' }
   s.author           = { 'Baseflow' => '[email protected]' }
   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, '11.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

geolocator_apple/ios/geolocator_apple.podspec renamed to geolocator_apple/darwin/geolocator_apple.podspec

@@ -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")
+            ]
+        )
+    ]
+)

geolocator_apple/darwin/geolocator_apple/Package.swift

@@ -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";

geolocator_apple/ios/Classes/Constants/ErrorCodes.m renamed to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Constants/ErrorCodes.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 ()
 

geolocator_apple/ios/Classes/GeolocatorPlugin.m renamed to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/GeolocatorPlugin.m

@@ -5,9 +5,9 @@
 //  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;
 

geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m renamed to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.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;

geolocator_apple/ios/Classes/Handlers/LocationAccuracyHandler.m renamed to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/LocationAccuracyHandler.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;