fluttercommunity · TarekTolba1 · Mar 20, 2025 · May 5, 2025
diff --git 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
+/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
diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h b/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h
diff --git a/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m b/arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m
diff --git 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 protected]' }
   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
@@ -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/...os/ios/Classes/SwiftArcgisMapPlugin.swift → .../arcgis_map_sdk_ios/ArcgisMapPlugin.swift b/...os/ios/Classes/SwiftArcgisMapPlugin.swift → .../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: "<native_map_view>")
 
-        let instance = SwiftArcgisMapPlugin()
+        let instance = ArcgisMapPlugin()
         let channel = FlutterMethodChannel(
                 name: "dev.fluttercommunity.arcgis_map_sdk",
                 binaryMessenger: registrar.messenger()

diff --git a/...p_sdk_ios/ios/Classes/ArcgisMapView.swift → ...es/arcgis_map_sdk_ios/ArcgisMapView.swift b/...p_sdk_ios/ios/Classes/ArcgisMapView.swift → ...es/arcgis_map_sdk_ios/ArcgisMapView.swift
@@ -1,5 +1,6 @@
 import ArcGIS
 import Foundation
+import Flutter
 
 class ArcgisMapView: NSObject, FlutterPlatformView {
 

diff --git a/...os/ios/Classes/ArcgisMapViewFactory.swift → ...is_map_sdk_ios/ArcgisMapViewFactory.swift b/...os/ios/Classes/ArcgisMapViewFactory.swift → ...is_map_sdk_ios/ArcgisMapViewFactory.swift
diff --git a/...Classes/CenterPositionStreamHandler.swift → ...sdk_ios/CenterPositionStreamHandler.swift b/...Classes/CenterPositionStreamHandler.swift → ...sdk_ios/CenterPositionStreamHandler.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Flutter
 
 class CenterPositionStreamHandler: NSObject, FlutterStreamHandler {
 

diff --git a/..._sdk_ios/ios/Classes/GraphicsParser.swift → ...s/arcgis_map_sdk_ios/GraphicsParser.swift b/..._sdk_ios/ios/Classes/GraphicsParser.swift → ...s/arcgis_map_sdk_ios/GraphicsParser.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 import ArcGIS
+import Flutter
 
 class GraphicsParser {
     let registrar: FlutterPluginRegistrar

diff --git a/...is_map_sdk_ios/ios/Classes/JsonUtil.swift → ...Sources/arcgis_map_sdk_ios/JsonUtil.swift b/...is_map_sdk_ios/ios/Classes/JsonUtil.swift → ...Sources/arcgis_map_sdk_ios/JsonUtil.swift
diff --git a/...os/Classes/ManualLocationDataSource.swift → ...ap_sdk_ios/ManualLocationDataSource.swift b/...os/Classes/ManualLocationDataSource.swift → ...ap_sdk_ios/ManualLocationDataSource.swift
diff --git a/...ios/Classes/Models/AnimationOptions.swift → ...map_sdk_ios/Models/AnimationOptions.swift b/...ios/Classes/Models/AnimationOptions.swift → ...map_sdk_ios/Models/AnimationOptions.swift
diff --git a/...ios/Classes/Models/ArcgisMapOptions.swift → ...map_sdk_ios/Models/ArcgisMapOptions.swift b/...ios/Classes/Models/ArcgisMapOptions.swift → ...map_sdk_ios/Models/ArcgisMapOptions.swift
diff --git a/...p_sdk_ios/ios/Classes/Models/LatLng.swift → ...es/arcgis_map_sdk_ios/Models/LatLng.swift b/...p_sdk_ios/ios/Classes/Models/LatLng.swift → ...es/arcgis_map_sdk_ios/Models/LatLng.swift
diff --git a/...sdk_ios/ios/Classes/Models/MapColor.swift → .../arcgis_map_sdk_ios/Models/MapColor.swift b/...sdk_ios/ios/Classes/Models/MapColor.swift → .../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
         )
     }
-}
+}
diff --git a/.../Symbols/PictureMarkerSymbolPayload.swift → .../Symbols/PictureMarkerSymbolPayload.swift b/.../Symbols/PictureMarkerSymbolPayload.swift → .../Symbols/PictureMarkerSymbolPayload.swift
diff --git a/...els/Symbols/SimpleFillSymbolPayload.swift → ...els/Symbols/SimpleFillSymbolPayload.swift b/...els/Symbols/SimpleFillSymbolPayload.swift → ...els/Symbols/SimpleFillSymbolPayload.swift
diff --git a/...els/Symbols/SimpleLineSymbolPayload.swift → ...els/Symbols/SimpleLineSymbolPayload.swift b/...els/Symbols/SimpleLineSymbolPayload.swift → ...els/Symbols/SimpleLineSymbolPayload.swift
diff --git a/...s/Symbols/SimpleMarkerSymbolPayload.swift → ...s/Symbols/SimpleMarkerSymbolPayload.swift b/...s/Symbols/SimpleMarkerSymbolPayload.swift → ...s/Symbols/SimpleMarkerSymbolPayload.swift
diff --git a/...ios/ios/Classes/Models/UserPosition.swift → ...gis_map_sdk_ios/Models/UserPosition.swift b/...ios/ios/Classes/Models/UserPosition.swift → ...gis_map_sdk_ios/Models/UserPosition.swift
diff --git a/..._ios/ios/Classes/Models/ViewPadding.swift → ...cgis_map_sdk_ios/Models/ViewPadding.swift b/..._ios/ios/Classes/Models/ViewPadding.swift → ...cgis_map_sdk_ios/Models/ViewPadding.swift
diff --git a/..._sdk_ios/ios/Classes/ParseException.swift → ...s/arcgis_map_sdk_ios/ParseException.swift b/..._sdk_ios/ios/Classes/ParseException.swift → ...s/arcgis_map_sdk_ios/ParseException.swift
diff --git a/...k_ios/ios/Classes/ZoomStreamHandler.swift → ...rcgis_map_sdk_ios/ZoomStreamHandler.swift b/...k_ios/ios/Classes/ZoomStreamHandler.swift → ...rcgis_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
@@ -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
@@ -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
@@ -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 = "<group>";
 		};
@@ -122,7 +123,6 @@
 				AFBD59F3D7EBE98D9F0820DA /* Pods-Runner.release.xcconfig */,
 				48FDB075D82D2D5142D6BACF /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -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
@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     //
     import Foundation
+    import Flutter
     class CenterPositionStreamHandler: NSObject, FlutterStreamHandler {
@@ Expand Down @@