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_apple/CHANGELOG.md b/geolocator_apple/CHANGELOG.md index d2c0786d..672503ec 100644 --- a/geolocator_apple/CHANGELOG.md +++ b/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. 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 00c7aace..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, '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 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 88% rename from geolocator_apple/ios/Classes/GeolocatorPlugin.m rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/GeolocatorPlugin.m index 18655922..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 -#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 () diff --git a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.m similarity index 97% rename from geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m rename to geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.m index e3808f18..162b3d9a 100644 --- a/geolocator_apple/ios/Classes/Handlers/GeolocationHandler.m +++ b/geolocator_apple/darwin/geolocator_apple/Sources/geolocator_apple/Handlers/GeolocationHandler.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; 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 #import -#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 #import -#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() 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 -#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_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() #import #import #import +#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 100% 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 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/Runner.xcodeproj/project.pbxproj b/geolocator_apple/example/ios/Runner.xcodeproj/project.pbxproj index 33880a1c..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; @@ -192,13 +194,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 591FD69E94FC610DB997784E /* [CP] Copy Pods Resources */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -249,6 +253,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -297,23 +304,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 591FD69E94FC610DB997784E /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 6E879EFB06735EEE96AC22A9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -772,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 0d7f6f9e..c90b55d4 100644 --- a/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/geolocator_apple/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + 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 @@ + + + + + + + + + + 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/ios/Assets/.gitkeep b/geolocator_apple/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 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/Resources/PrivacyInfo.xcprivacy b/geolocator_apple/macos/Resources/PrivacyInfo.xcprivacy deleted file mode 100644 index aac0f74c..00000000 --- a/geolocator_apple/macos/Resources/PrivacyInfo.xcprivacy +++ /dev/null @@ -1,14 +0,0 @@ - - - - - NSPrivacyTrackingDomains - - NSPrivacyAccessedAPITypes - - NSPrivacyCollectedDataTypes - - NSPrivacyTracking - - - diff --git a/geolocator_apple/macos/geolocator_apple.podspec b/geolocator_apple/macos/geolocator_apple.podspec deleted file mode 100644 index 6564f28f..00000000 --- a/geolocator_apple/macos/geolocator_apple.podspec +++ /dev/null @@ -1,23 +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' } - s.resource_bundles = {'geolocator_apple_privacy' => ['Resources/PrivacyInfo.xcprivacy']} - -end diff --git a/geolocator_apple/pubspec.yaml b/geolocator_apple/pubspec.yaml index f0223ec0..b632b055 100644 --- a/geolocator_apple/pubspec.yaml +++ b/geolocator_apple/pubspec.yaml @@ -2,7 +2,7 @@ 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.12 +version: 2.3.13 environment: sdk: ^3.5.0 @@ -15,9 +15,11 @@ flutter: ios: pluginClass: GeolocatorPlugin dartPluginClass: GeolocatorApple + sharedDarwinSource: true macos: pluginClass: GeolocatorPlugin dartPluginClass: GeolocatorApple + sharedDarwinSource: true dependencies: flutter: