Skip to content

Commit 8ac4ee5

Browse files
authored
Merge pull request #109 from Esri/update9
Merge update 9 code into master
2 parents b57fc2e + 92d05c7 commit 8ac4ee5

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
isa = PBXProject;
226226
attributes = {
227227
LastSwiftUpdateCheck = 0800;
228-
LastUpgradeCheck = 1020;
228+
LastUpgradeCheck = 1200;
229229
ORGANIZATIONNAME = Esri;
230230
TargetAttributes = {
231231
8839043A1DF6022A001F3188 = {
@@ -414,6 +414,7 @@
414414
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
415415
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
416416
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
417+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
417418
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
418419
CLANG_WARN_STRICT_PROTOTYPES = YES;
419420
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -474,6 +475,7 @@
474475
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
475476
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
476477
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
478+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
477479
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
478480
CLANG_WARN_STRICT_PROTOTYPES = YES;
479481
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -516,7 +518,7 @@
516518
INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
517519
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
518520
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
519-
MARKETING_VERSION = 100.8;
521+
MARKETING_VERSION = 100.9;
520522
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}";
521523
PRODUCT_NAME = "$(TARGET_NAME)";
522524
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -538,7 +540,7 @@
538540
INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
539541
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
540542
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
541-
MARKETING_VERSION = 100.8;
543+
MARKETING_VERSION = 100.9;
542544
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}";
543545
PRODUCT_NAME = "$(TARGET_NAME)";
544546
SWIFT_VERSION = 5.0;

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To use Toolkit in your project:
2424
* **[TimeSlider](Documentation/TimeSlider)** - Allows interactively defining a temporal range (i.e. time extent) and animating time moving forward or backward. Can be used to manipulate the time extent in a MapView or SceneView.
2525

2626
## Requirements
27-
* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.8.0 (or higher)
27+
* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.9.0 (or higher)
2828
* Xcode 11.0 (or higher)
2929

3030
The *ArcGIS Runtime Toolkit for iOS* has a *Target SDK* version of *12.0*, meaning that it can run on devices with *iOS 12.0* or newer.

Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
isa = PBXProject;
257257
attributes = {
258258
LastSwiftUpdateCheck = 1110;
259-
LastUpgradeCheck = 1020;
259+
LastUpgradeCheck = 1200;
260260
ORGANIZATIONNAME = Esri;
261261
TargetAttributes = {
262262
8812336F1DF601A700B2EA8E = {
@@ -400,6 +400,7 @@
400400
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
401401
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
402402
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
403+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
403404
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
404405
CLANG_WARN_STRICT_PROTOTYPES = YES;
405406
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -463,6 +464,7 @@
463464
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
464465
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
465466
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
467+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
466468
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
467469
CLANG_WARN_STRICT_PROTOTYPES = YES;
468470
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -511,7 +513,7 @@
511513
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
512514
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
513515
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
514-
MARKETING_VERSION = 100.8;
516+
MARKETING_VERSION = 100.9;
515517
PRODUCT_BUNDLE_IDENTIFIER = com.esri.ArcGISToolkit;
516518
PRODUCT_NAME = "$(TARGET_NAME)";
517519
SKIP_INSTALL = YES;
@@ -537,7 +539,7 @@
537539
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
538540
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
539541
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
540-
MARKETING_VERSION = 100.8;
542+
MARKETING_VERSION = 100.9;
541543
PRODUCT_BUNDLE_IDENTIFIER = com.esri.ArcGISToolkit;
542544
PRODUCT_NAME = "$(TARGET_NAME)";
543545
SKIP_INSTALL = YES;

Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1200"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Toolkit/ArcGISToolkit/BookmarksViewController.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public class BookmarksViewController: UIViewController {
6464
public init<S: Sequence>(bookmarks: S) where S.Element == AGSBookmark {
6565
super.init(nibName: nil, bundle: nil)
6666
self.bookmarks.append(contentsOf: bookmarks)
67+
tableViewController.bookmarks = self.bookmarks
6768
sharedInit()
6869
}
6970

0 commit comments

Comments
 (0)