From 57599d7fa108b1db4310d2945af538498d3d2ace Mon Sep 17 00:00:00 2001 From: Tarek Tolba Date: Thu, 20 Mar 2025 15:11:45 +0200 Subject: [PATCH] Migrate iOS plugin and example to swift package manager --- arcgis_map_sdk_ios/ios/.gitignore | 5 +- arcgis_map_sdk_ios/ios/Assets/.gitkeep | 0 .../ios/Classes/ArcgisMapPlugin.h | 4 - .../ios/Classes/ArcgisMapPlugin.m | 18 ----- .../ios/arcgis_map_sdk_ios.podspec | 2 +- .../ios/arcgis_map_sdk_ios/Package.swift | 25 ++++++ .../arcgis_map_sdk_ios/ArcgisMapPlugin.swift} | 5 +- .../arcgis_map_sdk_ios}/ArcgisMapView.swift | 1 + .../ArcgisMapViewFactory.swift | 0 .../CenterPositionStreamHandler.swift | 1 + .../arcgis_map_sdk_ios}/GraphicsParser.swift | 1 + .../arcgis_map_sdk_ios}/JsonUtil.swift | 0 .../ManualLocationDataSource.swift | 0 .../Models/AnimationOptions.swift | 0 .../Models/ArcgisMapOptions.swift | 0 .../arcgis_map_sdk_ios}/Models/LatLng.swift | 0 .../arcgis_map_sdk_ios}/Models/MapColor.swift | 3 +- .../Symbols/PictureMarkerSymbolPayload.swift | 0 .../Symbols/SimpleFillSymbolPayload.swift | 0 .../Symbols/SimpleLineSymbolPayload.swift | 0 .../Symbols/SimpleMarkerSymbolPayload.swift | 0 .../Models/UserPosition.swift | 0 .../Models/ViewPadding.swift | 0 .../arcgis_map_sdk_ios}/ParseException.swift | 0 .../ZoomStreamHandler.swift | 1 + example/ios/.gitignore | 2 + example/ios/Podfile.lock | 17 ----- example/ios/Runner.xcodeproj/project.pbxproj | 27 ++++++- .../xcshareddata/xcschemes/Runner.xcscheme | 19 +++++ example/pubspec.lock | 76 +++++++++---------- 30 files changed, 122 insertions(+), 85 deletions(-) delete mode 100644 arcgis_map_sdk_ios/ios/Assets/.gitkeep delete mode 100644 arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h delete mode 100644 arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m create mode 100644 arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Package.swift rename arcgis_map_sdk_ios/ios/{Classes/SwiftArcgisMapPlugin.swift => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapPlugin.swift} (81%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/ArcgisMapView.swift (99%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/ArcgisMapViewFactory.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/CenterPositionStreamHandler.swift (97%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/GraphicsParser.swift (99%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/JsonUtil.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/ManualLocationDataSource.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/AnimationOptions.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/ArcgisMapOptions.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/LatLng.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/MapColor.swift (96%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/Symbols/PictureMarkerSymbolPayload.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/Symbols/SimpleFillSymbolPayload.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/Symbols/SimpleLineSymbolPayload.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/Symbols/SimpleMarkerSymbolPayload.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/UserPosition.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/Models/ViewPadding.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/ParseException.swift (100%) rename arcgis_map_sdk_ios/ios/{Classes => arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios}/ZoomStreamHandler.swift (97%) diff --git a/arcgis_map_sdk_ios/ios/.gitignore b/arcgis_map_sdk_ios/ios/.gitignore index 0c885071e..e266b1580 100644 --- a/arcgis_map_sdk_ios/ios/.gitignore +++ b/arcgis_map_sdk_ios/ios/.gitignore @@ -35,4 +35,7 @@ Icon? /Flutter/Generated.xcconfig /Flutter/ephemeral/ -/Flutter/flutter_export_environment.sh \ No newline at end of file +/Flutter/flutter_export_environment.sh + +.swiftpm/ +Package.resolved diff --git a/arcgis_map_sdk_ios/ios/Assets/.gitkeep b/arcgis_map_sdk_ios/ios/Assets/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h b/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h deleted file mode 100644 index 9df35be08..000000000 --- a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h +++ /dev/null @@ -1,4 +0,0 @@ -#import - -@interface ArcgisMapPlugin : NSObject -@end diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m b/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m deleted file mode 100644 index 4884e5c8f..000000000 --- a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m +++ /dev/null @@ -1,18 +0,0 @@ -#import "ArcgisMapPlugin.h" - -#if __has_include() - -#import - -#else -// Support project import fallback if the generated compatibility header -// is not copied when this plugin is created as a library. -// https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816 -#import "arcgis_map_sdk_ios-Swift.h" -#endif - -@implementation ArcgisMapPlugin -+ (void)registerWithRegistrar:(NSObject *)registrar { - [SwiftArcgisMapPlugin registerWithRegistrar:registrar]; -} -@end diff --git a/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec index 771fbf77b..4971088cf 100644 --- a/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec @@ -12,7 +12,7 @@ A new Flutter project. s.homepage = 'http://example.com' s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'arcgis_map_sdk_ios/Sources/**/*' s.dependency 'Flutter' s.dependency 'ArcGIS-Runtime-Toolkit-iOS' s.platform = :ios, '13.0' diff --git a/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Package.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Package.swift new file mode 100644 index 000000000..c16447b7e --- /dev/null +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Package.swift @@ -0,0 +1,25 @@ +// 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: "arcgis_map_sdk_ios", + platforms: [ + .iOS("14.0") + ], + products: [ + .library(name: "arcgis-map-sdk-ios", targets: ["arcgis_map_sdk_ios"]) + ], + dependencies: [ + .package(url: "https://github.com/Esri/arcgis-runtime-ios", .upToNextMinor(from: "100.15.0")), + ], + targets: [ + .target( + name: "arcgis_map_sdk_ios", + dependencies: [ + .product(name: "ArcGIS", package: "arcgis-runtime-ios") + ] + ), + ] +) diff --git a/arcgis_map_sdk_ios/ios/Classes/SwiftArcgisMapPlugin.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapPlugin.swift similarity index 81% rename from arcgis_map_sdk_ios/ios/Classes/SwiftArcgisMapPlugin.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapPlugin.swift index 20ec718d8..03e244736 100644 --- a/arcgis_map_sdk_ios/ios/Classes/SwiftArcgisMapPlugin.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapPlugin.swift @@ -2,12 +2,11 @@ import Flutter import UIKit import ArcGIS -public class SwiftArcgisMapPlugin: NSObject, FlutterPlugin { - +public class ArcgisMapPlugin: NSObject, FlutterPlugin { public static func register(with registrar: FlutterPluginRegistrar) { registrar.register(ArcgisMapViewFactory(registrar: registrar), withId: "") - let instance = SwiftArcgisMapPlugin() + let instance = ArcgisMapPlugin() let channel = FlutterMethodChannel( name: "dev.fluttercommunity.arcgis_map_sdk", binaryMessenger: registrar.messenger() diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapView.swift similarity index 99% rename from arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapView.swift index 1c570f7b3..a7d86fea4 100644 --- a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapView.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapView.swift @@ -1,5 +1,6 @@ import ArcGIS import Foundation +import Flutter class ArcgisMapView: NSObject, FlutterPlatformView { diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapViewFactory.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapViewFactory.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/ArcgisMapViewFactory.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapViewFactory.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/CenterPositionStreamHandler.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/CenterPositionStreamHandler.swift similarity index 97% rename from arcgis_map_sdk_ios/ios/Classes/CenterPositionStreamHandler.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/CenterPositionStreamHandler.swift index d7fe6fa8e..5a790aca8 100644 --- a/arcgis_map_sdk_ios/ios/Classes/CenterPositionStreamHandler.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/CenterPositionStreamHandler.swift @@ -6,6 +6,7 @@ // import Foundation +import Flutter class CenterPositionStreamHandler: NSObject, FlutterStreamHandler { diff --git a/arcgis_map_sdk_ios/ios/Classes/GraphicsParser.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/GraphicsParser.swift similarity index 99% rename from arcgis_map_sdk_ios/ios/Classes/GraphicsParser.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/GraphicsParser.swift index a671614be..b2da69487 100644 --- a/arcgis_map_sdk_ios/ios/Classes/GraphicsParser.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/GraphicsParser.swift @@ -7,6 +7,7 @@ import Foundation import ArcGIS +import Flutter class GraphicsParser { let registrar: FlutterPluginRegistrar diff --git a/arcgis_map_sdk_ios/ios/Classes/JsonUtil.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/JsonUtil.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/JsonUtil.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/JsonUtil.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/ManualLocationDataSource.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ManualLocationDataSource.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/ManualLocationDataSource.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ManualLocationDataSource.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/AnimationOptions.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/AnimationOptions.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/AnimationOptions.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/AnimationOptions.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/ArcgisMapOptions.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/ArcgisMapOptions.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/ArcgisMapOptions.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/ArcgisMapOptions.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/LatLng.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/LatLng.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/LatLng.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/LatLng.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/MapColor.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/MapColor.swift similarity index 96% rename from arcgis_map_sdk_ios/ios/Classes/Models/MapColor.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/MapColor.swift index a19a5b2fc..44c7644a8 100644 --- a/arcgis_map_sdk_ios/ios/Classes/Models/MapColor.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/MapColor.swift @@ -3,6 +3,7 @@ // import Foundation +import UIKit struct MapColor: Codable { var red: Double @@ -20,4 +21,4 @@ extension MapColor { alpha: opacity ) } -} \ No newline at end of file +} diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/Symbols/PictureMarkerSymbolPayload.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/PictureMarkerSymbolPayload.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/Symbols/PictureMarkerSymbolPayload.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/PictureMarkerSymbolPayload.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleFillSymbolPayload.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleFillSymbolPayload.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleFillSymbolPayload.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleFillSymbolPayload.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleLineSymbolPayload.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleLineSymbolPayload.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleLineSymbolPayload.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleLineSymbolPayload.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleMarkerSymbolPayload.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleMarkerSymbolPayload.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/Symbols/SimpleMarkerSymbolPayload.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/Symbols/SimpleMarkerSymbolPayload.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/UserPosition.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/UserPosition.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/UserPosition.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/UserPosition.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/Models/ViewPadding.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/ViewPadding.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/Models/ViewPadding.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/Models/ViewPadding.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/ParseException.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ParseException.swift similarity index 100% rename from arcgis_map_sdk_ios/ios/Classes/ParseException.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ParseException.swift diff --git a/arcgis_map_sdk_ios/ios/Classes/ZoomStreamHandler.swift b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ZoomStreamHandler.swift similarity index 97% rename from arcgis_map_sdk_ios/ios/Classes/ZoomStreamHandler.swift rename to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ZoomStreamHandler.swift index 8a78362e0..092724b88 100644 --- a/arcgis_map_sdk_ios/ios/Classes/ZoomStreamHandler.swift +++ b/arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ZoomStreamHandler.swift @@ -6,6 +6,7 @@ // import Foundation +import Flutter class ZoomStreamHandler: NSObject, FlutterStreamHandler { diff --git a/example/ios/.gitignore b/example/ios/.gitignore index 7a7f9873a..fad3bebad 100644 --- a/example/ios/.gitignore +++ b/example/ios/.gitignore @@ -32,3 +32,5 @@ Runner/GeneratedPluginRegistrant.* !default.mode2v3 !default.pbxuser !default.perspectivev3 + +Package.resolved diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index beb177e9e..e9d4ff56a 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,36 +1,19 @@ PODS: - - ArcGIS-Runtime-SDK-iOS (100.14.1) - - ArcGIS-Runtime-Toolkit-iOS (100.14.0): - - ArcGIS-Runtime-SDK-iOS (~> 100.14.0) - - arcgis_map_sdk_ios (0.0.1): - - ArcGIS-Runtime-Toolkit-iOS - - Flutter - Flutter (1.0.0) - geolocator_apple (1.2.0): - Flutter DEPENDENCIES: - - arcgis_map_sdk_ios (from `.symlinks/plugins/arcgis_map_sdk_ios/ios`) - Flutter (from `Flutter`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) -SPEC REPOS: - trunk: - - ArcGIS-Runtime-SDK-iOS - - ArcGIS-Runtime-Toolkit-iOS - EXTERNAL SOURCES: - arcgis_map_sdk_ios: - :path: ".symlinks/plugins/arcgis_map_sdk_ios/ios" Flutter: :path: Flutter geolocator_apple: :path: ".symlinks/plugins/geolocator_apple/ios" SPEC CHECKSUMS: - ArcGIS-Runtime-SDK-iOS: 6ab51d28f8831ac73c00d34998cff3a555fe304f - ArcGIS-Runtime-Toolkit-iOS: e30bb45bd0bd0152bcb1ec73f9b99022a5c7d02d - arcgis_map_sdk_ios: deb0d9d2dfedca86984c0aa81e6245eed03c8344 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 geolocator_apple: d981750b9f47dbdb02427e1476d9a04397beb8d9 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index b475bba3b..203a25522 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 605FA5D163A7B2040C9667D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DFBB57AA011A2DA64754497 /* Pods_Runner.framework */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -54,6 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 605FA5D163A7B2040C9667D1 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -88,7 +90,6 @@ 97C146EF1CF9000F007C117D /* Products */, EC58D96A64CE4D3D7740F25D /* Pods */, 3776939CBC3633F36418AFD9 /* Frameworks */, - 838A69020171B4AA9B387170 /* SimpleMarkerSymbolPayload.swift */, ); sourceTree = ""; }; @@ -122,7 +123,6 @@ AFBD59F3D7EBE98D9F0820DA /* Pods-Runner.release.xcconfig */, 48FDB075D82D2D5142D6BACF /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -147,6 +147,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -175,6 +178,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -363,6 +369,7 @@ DEVELOPMENT_TEAM = 64Z45JP26B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -492,6 +499,7 @@ DEVELOPMENT_TEAM = 64Z45JP26B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -515,6 +523,7 @@ DEVELOPMENT_TEAM = 64Z45JP26B; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -551,6 +560,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/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/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5e31d3d34..128d5765a 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + diff --git a/example/pubspec.lock b/example/pubspec.lock index 91231b194..6071eddfb 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -47,42 +47,42 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" characters: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" crypto: dependency: transitive description: @@ -103,10 +103,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" fixnum: dependency: transitive description: @@ -206,18 +206,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -238,10 +238,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -254,18 +254,18 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" plugin_platform_interface: dependency: transitive description: @@ -278,15 +278,15 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -299,42 +299,42 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" typed_data: dependency: transitive description: @@ -363,10 +363,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.2.5" + version: "14.3.1" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54"