Skip to content

Commit 846bf79

Browse files
Migrate iOS plugin and example to use swift package manager (#86)
* Migrate iOS plugin and example to swift package manager * Upgrade iOS SDK to v200.7 (#90) * Upgrade arcgis sdk * Upgrade arcgis sdk + create MapContentView * Fix few issues after upgrading sdk * Fix few issues after upgrading sdk * Clean code * fix build * reformat code * Update CustomLocationProvider.swift * Fix location indicator example --------- Co-authored-by: Julian Bissekkou <[email protected]> --------- Co-authored-by: Julian Bissekkou <[email protected]>
1 parent 8109f31 commit 846bf79

35 files changed

+487
-357
lines changed

arcgis_map_sdk_ios/ios/.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ Icon?
3535

3636
/Flutter/Generated.xcconfig
3737
/Flutter/ephemeral/
38-
/Flutter/flutter_export_environment.sh
38+
/Flutter/flutter_export_environment.sh
39+
40+
.swiftpm/
41+
Package.resolved

arcgis_map_sdk_ios/ios/Assets/.gitkeep

Whitespace-only changes.

arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

arcgis_map_sdk_ios/ios/Classes/ArcgisMapPlugin.m

Lines changed: 0 additions & 18 deletions
This file was deleted.

arcgis_map_sdk_ios/ios/Classes/ManualLocationDataSource.swift

Lines changed: 0 additions & 22 deletions
This file was deleted.

arcgis_map_sdk_ios/ios/Classes/Models/AnimationOptions.swift

Lines changed: 0 additions & 31 deletions
This file was deleted.

arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios.podspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ A new Flutter project.
1212
s.homepage = 'http://example.com'
1313
s.author = { 'Your Company' => '[email protected]' }
1414
s.source = { :path => '.' }
15-
s.source_files = 'Classes/**/*'
15+
s.source_files = 'arcgis_map_sdk_ios/Sources/**/*'
1616
s.dependency 'Flutter'
17-
s.dependency 'ArcGIS-Runtime-Toolkit-iOS'
18-
s.platform = :ios, '13.0'
17+
s.platform = :ios, '16.0'
1918

2019
# Flutter.framework does not contain a i386 slice.
2120
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// swift-tools-version: 5.9
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
4+
import PackageDescription
5+
6+
let package = Package(
7+
name: "arcgis_map_sdk_ios",
8+
platforms: [
9+
.iOS("16.0")
10+
],
11+
products: [
12+
.library(name: "arcgis-map-sdk-ios", targets: ["arcgis_map_sdk_ios"])
13+
],
14+
dependencies: [
15+
.package(url: "https://github.com/Esri/arcgis-maps-sdk-swift", .upToNextMinor(from: "200.7.0")),
16+
],
17+
targets: [
18+
.target(
19+
name: "arcgis_map_sdk_ios",
20+
dependencies: [
21+
.product(name: "ArcGIS", package: "arcgis-maps-sdk-swift")
22+
]
23+
),
24+
]
25+
)

arcgis_map_sdk_ios/ios/Classes/SwiftArcgisMapPlugin.swift renamed to arcgis_map_sdk_ios/ios/arcgis_map_sdk_ios/Sources/arcgis_map_sdk_ios/ArcgisMapPlugin.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ import Flutter
22
import UIKit
33
import ArcGIS
44

5-
public class SwiftArcgisMapPlugin: NSObject, FlutterPlugin {
6-
5+
public class ArcgisMapPlugin: NSObject, FlutterPlugin {
76
public static func register(with registrar: FlutterPluginRegistrar) {
87
registrar.register(ArcgisMapViewFactory(registrar: registrar), withId: "<native_map_view>")
98

10-
let instance = SwiftArcgisMapPlugin()
9+
let instance = ArcgisMapPlugin()
1110
let channel = FlutterMethodChannel(
1211
name: "dev.fluttercommunity.arcgis_map_sdk",
1312
binaryMessenger: registrar.messenger()

0 commit comments

Comments
 (0)