Skip to content

Commit 90db275

Browse files
dg0yaldg0yal
authored
Merge pull request #147 from Esri/update11
Update11
2 parents 69dd6e2 + e479f78 commit 90db275

File tree

76 files changed

+146
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+146
-886
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ playground.xcworkspace
3939
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
4040
# Packages/
4141
.build/
42+
Package.resolved
43+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
4244

4345
# CocoaPods
4446
#

‎.swiftlint.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,7 @@ disabled_rules:
5959
- line_length
6060
- nesting
6161
- todo
62-
- trailing_whitespace
6362
- type_body_length
63+
64+
trailing_whitespace:
65+
ignores_empty_lines: true

‎Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme‎ renamed to ‎.swiftpm/xcode/xcshareddata/xcschemes/ArcGISToolkit.xcscheme‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,24 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "8812336F1DF601A700B2EA8E"
18-
BuildableName = "ArcGISToolkit.framework"
17+
BlueprintIdentifier = "ArcGISToolkit"
18+
BuildableName = "ArcGISToolkit"
1919
BlueprintName = "ArcGISToolkit"
20-
ReferencedContainer = "container:ArcGISToolkit.xcodeproj">
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "NO">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "ArcGISToolkitTests"
32+
BuildableName = "ArcGISToolkitTests"
33+
BlueprintName = "ArcGISToolkitTests"
34+
ReferencedContainer = "container:">
2135
</BuildableReference>
2236
</BuildActionEntry>
2337
</BuildActionEntries>
@@ -32,10 +46,10 @@
3246
skipped = "NO">
3347
<BuildableReference
3448
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "E4685B02237CA3C400F168CF"
36-
BuildableName = "ArcGISToolkitTests.xctest"
49+
BlueprintIdentifier = "ArcGISToolkitTests"
50+
BuildableName = "ArcGISToolkitTests"
3751
BlueprintName = "ArcGISToolkitTests"
38-
ReferencedContainer = "container:ArcGISToolkit.xcodeproj">
52+
ReferencedContainer = "container:">
3953
</BuildableReference>
4054
</TestableReference>
4155
</Testables>
@@ -50,15 +64,6 @@
5064
debugDocumentVersioning = "YES"
5165
debugServiceExtension = "internal"
5266
allowLocationSimulation = "YES">
53-
<MacroExpansion>
54-
<BuildableReference
55-
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "8812336F1DF601A700B2EA8E"
57-
BuildableName = "ArcGISToolkit.framework"
58-
BlueprintName = "ArcGISToolkit"
59-
ReferencedContainer = "container:ArcGISToolkit.xcodeproj">
60-
</BuildableReference>
61-
</MacroExpansion>
6267
</LaunchAction>
6368
<ProfileAction
6469
buildConfiguration = "Release"
@@ -69,10 +74,10 @@
6974
<MacroExpansion>
7075
<BuildableReference
7176
BuildableIdentifier = "primary"
72-
BlueprintIdentifier = "8812336F1DF601A700B2EA8E"
73-
BuildableName = "ArcGISToolkit.framework"
77+
BlueprintIdentifier = "ArcGISToolkit"
78+
BuildableName = "ArcGISToolkit"
7479
BlueprintName = "ArcGISToolkit"
75-
ReferencedContainer = "container:ArcGISToolkit.xcodeproj">
80+
ReferencedContainer = "container:">
7681
</BuildableReference>
7782
</MacroExpansion>
7883
</ProfileAction>

‎Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
2140781E209B629000FBFDCC /* TimeSliderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2140781D209B629000FBFDCC /* TimeSliderExample.swift */; };
11+
79CA564425F1952D00E9FE3D /* ArcGISToolkit in Frameworks */ = {isa = PBXBuildFile; productRef = 79CA564325F1952D00E9FE3D /* ArcGISToolkit */; };
1112
8800656E2228577A00F76945 /* TemplatePickerExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8800656D2228577A00F76945 /* TemplatePickerExample.swift */; };
1213
883904441DF6022A001F3188 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 883904421DF6022A001F3188 /* Main.storyboard */; };
1314
883904461DF6022A001F3188 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 883904451DF6022A001F3188 /* Assets.xcassets */; };
1415
883904491DF6022A001F3188 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 883904471DF6022A001F3188 /* LaunchScreen.storyboard */; };
1516
883EA74B20741A56006D6F72 /* PopupExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 883EA74A20741A56006D6F72 /* PopupExample.swift */; };
16-
88A01D7D1EA188EF00CD9621 /* ArcGISToolkit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88B689A41E96E9AC00B67FAB /* ArcGISToolkit.framework */; };
17-
88A01D7E1EA188EF00CD9621 /* ArcGISToolkit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88B689A41E96E9AC00B67FAB /* ArcGISToolkit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1817
88B689C81E96EDF400B67FAB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B689BE1E96EDF400B67FAB /* AppDelegate.swift */; };
1918
88B689C91E96EDF400B67FAB /* ExamplesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B689BF1E96EDF400B67FAB /* ExamplesViewController.swift */; };
2019
88B689CB1E96EDF400B67FAB /* MeasureExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88B689C11E96EDF400B67FAB /* MeasureExample.swift */; };
@@ -30,59 +29,18 @@
3029
E47B17372304AB7D000C9C8B /* CalibrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47B17352304AB7D000C9C8B /* CalibrationView.swift */; };
3130
E48405751E9BE7E600927208 /* LegendExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E48405741E9BE7E600927208 /* LegendExample.swift */; };
3231
E48ADDBA23563E17005A53AF /* BookmarksExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E48ADDB923563E17005A53AF /* BookmarksExample.swift */; };
33-
E4F93A45255C8C2900298E30 /* ArcGIS.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4E7E57F255C51A4002458B9 /* ArcGIS.xcframework */; };
34-
E4F93A46255C8C2900298E30 /* ArcGIS.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E4E7E57F255C51A4002458B9 /* ArcGIS.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3532
/* End PBXBuildFile section */
3633

37-
/* Begin PBXContainerItemProxy section */
38-
88B689A31E96E9AC00B67FAB /* PBXContainerItemProxy */ = {
39-
isa = PBXContainerItemProxy;
40-
containerPortal = 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */;
41-
proxyType = 2;
42-
remoteGlobalIDString = 881233701DF601A700B2EA8E;
43-
remoteInfo = ArcGISToolkit;
44-
};
45-
88B689A51E96E9E000B67FAB /* PBXContainerItemProxy */ = {
46-
isa = PBXContainerItemProxy;
47-
containerPortal = 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */;
48-
proxyType = 1;
49-
remoteGlobalIDString = 8812336F1DF601A700B2EA8E;
50-
remoteInfo = ArcGISToolkit;
51-
};
52-
E4CD706023A8436F000A3B1C /* PBXContainerItemProxy */ = {
53-
isa = PBXContainerItemProxy;
54-
containerPortal = 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */;
55-
proxyType = 2;
56-
remoteGlobalIDString = E4685B03237CA3C400F168CF;
57-
remoteInfo = ArcGISToolkitTests;
58-
};
59-
/* End PBXContainerItemProxy section */
60-
61-
/* Begin PBXCopyFilesBuildPhase section */
62-
883904531DF60296001F3188 /* Embed Frameworks */ = {
63-
isa = PBXCopyFilesBuildPhase;
64-
buildActionMask = 2147483647;
65-
dstPath = "";
66-
dstSubfolderSpec = 10;
67-
files = (
68-
E4F93A46255C8C2900298E30 /* ArcGIS.xcframework in Embed Frameworks */,
69-
88A01D7E1EA188EF00CD9621 /* ArcGISToolkit.framework in Embed Frameworks */,
70-
);
71-
name = "Embed Frameworks";
72-
runOnlyForDeploymentPostprocessing = 0;
73-
};
74-
/* End PBXCopyFilesBuildPhase section */
75-
7634
/* Begin PBXFileReference section */
7735
2140781D209B629000FBFDCC /* TimeSliderExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeSliderExample.swift; sourceTree = "<group>"; };
36+
79CA564025F1942200E9FE3D /* arcgis-runtime-toolkit-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "arcgis-runtime-toolkit-ios"; path = ..; sourceTree = "<group>"; };
7837
8800656D2228577A00F76945 /* TemplatePickerExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TemplatePickerExample.swift; sourceTree = "<group>"; };
7938
8839043B1DF6022A001F3188 /* ArcGISToolkitExamples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ArcGISToolkitExamples.app; sourceTree = BUILT_PRODUCTS_DIR; };
8039
883904431DF6022A001F3188 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8140
883904451DF6022A001F3188 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8241
883904481DF6022A001F3188 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8342
8839044A1DF6022A001F3188 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8443
883EA74A20741A56006D6F72 /* PopupExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupExample.swift; sourceTree = "<group>"; };
85-
88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ArcGISToolkit.xcodeproj; path = ../Toolkit/ArcGISToolkit.xcodeproj; sourceTree = "<group>"; };
8644
88B689BE1E96EDF400B67FAB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8745
88B689BF1E96EDF400B67FAB /* ExamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesViewController.swift; sourceTree = "<group>"; };
8846
88B689C11E96EDF400B67FAB /* MeasureExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MeasureExample.swift; sourceTree = "<group>"; };
@@ -98,16 +56,14 @@
9856
E47B17352304AB7D000C9C8B /* CalibrationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalibrationView.swift; sourceTree = "<group>"; };
9957
E48405741E9BE7E600927208 /* LegendExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegendExample.swift; sourceTree = "<group>"; };
10058
E48ADDB923563E17005A53AF /* BookmarksExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksExample.swift; sourceTree = "<group>"; };
101-
E4E7E57F255C51A4002458B9 /* ArcGIS.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ArcGIS.xcframework; path = $HOME/Library/SDKs/ArcGIS/Frameworks/ArcGIS.xcframework; sourceTree = "<absolute>"; };
10259
/* End PBXFileReference section */
10360

10461
/* Begin PBXFrameworksBuildPhase section */
10562
883904381DF6022A001F3188 /* Frameworks */ = {
10663
isa = PBXFrameworksBuildPhase;
10764
buildActionMask = 2147483647;
10865
files = (
109-
E4F93A45255C8C2900298E30 /* ArcGIS.xcframework in Frameworks */,
110-
88A01D7D1EA188EF00CD9621 /* ArcGISToolkit.framework in Frameworks */,
66+
79CA564425F1952D00E9FE3D /* ArcGISToolkit in Frameworks */,
11167
);
11268
runOnlyForDeploymentPostprocessing = 0;
11369
};
@@ -117,10 +73,9 @@
11773
883904321DF6022A001F3188 = {
11874
isa = PBXGroup;
11975
children = (
120-
88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */,
76+
79CA564025F1942200E9FE3D /* arcgis-runtime-toolkit-ios */,
12177
8839043D1DF6022A001F3188 /* ArcGISToolkitExamples */,
12278
8839043C1DF6022A001F3188 /* Products */,
123-
E4E7E57E255C51A4002458B9 /* Frameworks */,
12479
);
12580
sourceTree = "<group>";
12681
};
@@ -148,15 +103,6 @@
148103
path = ArcGISToolkitExamples;
149104
sourceTree = "<group>";
150105
};
151-
88B689A01E96E9AB00B67FAB /* Products */ = {
152-
isa = PBXGroup;
153-
children = (
154-
88B689A41E96E9AC00B67FAB /* ArcGISToolkit.framework */,
155-
E4CD706123A8436F000A3B1C /* ArcGISToolkitTests.xctest */,
156-
);
157-
name = Products;
158-
sourceTree = "<group>";
159-
};
160106
88B689D21E96EDFE00B67FAB /* Examples */ = {
161107
isa = PBXGroup;
162108
children = (
@@ -186,14 +132,6 @@
186132
path = Misc;
187133
sourceTree = "<group>";
188134
};
189-
E4E7E57E255C51A4002458B9 /* Frameworks */ = {
190-
isa = PBXGroup;
191-
children = (
192-
E4E7E57F255C51A4002458B9 /* ArcGIS.xcframework */,
193-
);
194-
name = Frameworks;
195-
sourceTree = "<group>";
196-
};
197135
/* End PBXGroup section */
198136

199137
/* Begin PBXNativeTarget section */
@@ -204,15 +142,16 @@
204142
883904371DF6022A001F3188 /* Sources */,
205143
883904381DF6022A001F3188 /* Frameworks */,
206144
883904391DF6022A001F3188 /* Resources */,
207-
883904531DF60296001F3188 /* Embed Frameworks */,
208145
E47ED066233AC27B0032440E /* Run Linter */,
209146
);
210147
buildRules = (
211148
);
212149
dependencies = (
213-
88B689A61E96E9E000B67FAB /* PBXTargetDependency */,
214150
);
215151
name = ArcGISToolkitExamples;
152+
packageProductDependencies = (
153+
79CA564325F1952D00E9FE3D /* ArcGISToolkit */,
154+
);
216155
productName = ArcGISToolkitExamples;
217156
productReference = 8839043B1DF6022A001F3188 /* ArcGISToolkitExamples.app */;
218157
productType = "com.apple.product-type.application";
@@ -250,36 +189,13 @@
250189
mainGroup = 883904321DF6022A001F3188;
251190
productRefGroup = 8839043C1DF6022A001F3188 /* Products */;
252191
projectDirPath = "";
253-
projectReferences = (
254-
{
255-
ProductGroup = 88B689A01E96E9AB00B67FAB /* Products */;
256-
ProjectRef = 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */;
257-
},
258-
);
259192
projectRoot = "";
260193
targets = (
261194
8839043A1DF6022A001F3188 /* ArcGISToolkitExamples */,
262195
);
263196
};
264197
/* End PBXProject section */
265198

266-
/* Begin PBXReferenceProxy section */
267-
88B689A41E96E9AC00B67FAB /* ArcGISToolkit.framework */ = {
268-
isa = PBXReferenceProxy;
269-
fileType = wrapper.framework;
270-
path = ArcGISToolkit.framework;
271-
remoteRef = 88B689A31E96E9AC00B67FAB /* PBXContainerItemProxy */;
272-
sourceTree = BUILT_PRODUCTS_DIR;
273-
};
274-
E4CD706123A8436F000A3B1C /* ArcGISToolkitTests.xctest */ = {
275-
isa = PBXReferenceProxy;
276-
fileType = wrapper.cfbundle;
277-
path = ArcGISToolkitTests.xctest;
278-
remoteRef = E4CD706023A8436F000A3B1C /* PBXContainerItemProxy */;
279-
sourceTree = BUILT_PRODUCTS_DIR;
280-
};
281-
/* End PBXReferenceProxy section */
282-
283199
/* Begin PBXResourcesBuildPhase section */
284200
883904391DF6022A001F3188 /* Resources */ = {
285201
isa = PBXResourcesBuildPhase;
@@ -342,14 +258,6 @@
342258
};
343259
/* End PBXSourcesBuildPhase section */
344260

345-
/* Begin PBXTargetDependency section */
346-
88B689A61E96E9E000B67FAB /* PBXTargetDependency */ = {
347-
isa = PBXTargetDependency;
348-
name = ArcGISToolkit;
349-
targetProxy = 88B689A51E96E9E000B67FAB /* PBXContainerItemProxy */;
350-
};
351-
/* End PBXTargetDependency section */
352-
353261
/* Begin PBXVariantGroup section */
354262
883904421DF6022A001F3188 /* Main.storyboard */ = {
355263
isa = PBXVariantGroup;
@@ -493,7 +401,7 @@
493401
CLANG_ENABLE_MODULES = YES;
494402
DEVELOPMENT_TEAM = "";
495403
INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
496-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
404+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
497405
LD_RUNPATH_SEARCH_PATHS = (
498406
"$(inherited)",
499407
"@executable_path/Frameworks",
@@ -513,7 +421,7 @@
513421
CLANG_ENABLE_MODULES = YES;
514422
DEVELOPMENT_TEAM = "";
515423
INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
516-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
424+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
517425
LD_RUNPATH_SEARCH_PATHS = (
518426
"$(inherited)",
519427
"@executable_path/Frameworks",
@@ -547,6 +455,13 @@
547455
defaultConfigurationName = Release;
548456
};
549457
/* End XCConfigurationList section */
458+
459+
/* Begin XCSwiftPackageProductDependency section */
460+
79CA564325F1952D00E9FE3D /* ArcGISToolkit */ = {
461+
isa = XCSwiftPackageProductDependency;
462+
productName = ArcGISToolkit;
463+
};
464+
/* End XCSwiftPackageProductDependency section */
550465
};
551466
rootObject = 883904331DF6022A001F3188 /* Project object */;
552467
}

‎Examples/ArcGISToolkitExamples/JobManagerExample.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import ArcGISToolkit
1717
import UserNotifications
1818

1919
// NOTE:
20-
//
20+
//
2121
// The JobManagerExample allows you to kick off some jobs, kill the application,
2222
// restart the application, and find out what jobs were running and have the ability to
2323
// resume them.

‎Examples/README.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ This project contains examples of how to use the toolkit components.
33
## Instructions
44

55

6-
1. Ensure you have downloaded and installed __ArcGIS Runtime SDK for iOS__ as described [here](https://developers.arcgis.com/ios/get-started/)
7-
2. Clone or download this repo.
8-
3. Open the Examples project in Xcode by double clicking on the `ArcGISToolkitExamples.xcodeproj` file
9-
4. Build and run the project.
10-
6+
1. Clone or download this repo
7+
2. Open the Examples project in Xcode by double clicking on the `ArcGISToolkitExamples.xcodeproj` file
8+
3. Build and run the project

0 commit comments

Comments
 (0)