From b4b2063fd2c63823fffb9dd1b25af3018988d4b5 Mon Sep 17 00:00:00 2001 From: Philip Ridgeway Date: Thu, 25 Jun 2020 08:10:20 -0700 Subject: [PATCH 1/4] Upgrade to settings recommended by Xcode 12 This addresses buildtime issues when building with Xcode 12. Changes made by Xcode and are backwards compatible. --- Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj | 4 +++- Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj | 4 +++- .../xcshareddata/xcschemes/ArcGISToolkit.xcscheme | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj index 2e0889be..c9d97e4e 100644 --- a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj +++ b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj @@ -225,7 +225,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = Esri; TargetAttributes = { 8839043A1DF6022A001F3188 = { @@ -414,6 +414,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -474,6 +475,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj b/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj index 0c664e90..431d5db5 100644 --- a/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj +++ b/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj @@ -256,7 +256,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1110; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = Esri; TargetAttributes = { 8812336F1DF601A700B2EA8E = { @@ -400,6 +400,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -463,6 +464,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme b/Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme index 9f3cf86f..b3d4973a 100644 --- a/Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme +++ b/Toolkit/ArcGISToolkit.xcodeproj/xcshareddata/xcschemes/ArcGISToolkit.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 17 Aug 2020 12:55:31 -0500 Subject: [PATCH 2/4] Update table bookmarks property when setting bookmarks in constructor. --- Toolkit/ArcGISToolkit/BookmarksViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Toolkit/ArcGISToolkit/BookmarksViewController.swift b/Toolkit/ArcGISToolkit/BookmarksViewController.swift index 81611a0e..a17ba447 100644 --- a/Toolkit/ArcGISToolkit/BookmarksViewController.swift +++ b/Toolkit/ArcGISToolkit/BookmarksViewController.swift @@ -64,6 +64,7 @@ public class BookmarksViewController: UIViewController { public init(bookmarks: S) where S.Element == AGSBookmark { super.init(nibName: nil, bundle: nil) self.bookmarks.append(contentsOf: bookmarks) + tableViewController.bookmarks = self.bookmarks sharedInit() } From 1ba5c9a8338599e299a236126a3026aac12ad968 Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Tue, 18 Aug 2020 12:03:25 -0500 Subject: [PATCH 3/4] update "MARKETING_VERSION" number to 100.9 --- Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj | 4 ++-- Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj index c9d97e4e..a5d98264 100644 --- a/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj +++ b/Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj @@ -518,7 +518,7 @@ INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 100.8; + MARKETING_VERSION = 100.9; PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -540,7 +540,7 @@ INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 100.8; + MARKETING_VERSION = 100.9; PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj b/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj index 431d5db5..eb6702b7 100644 --- a/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj +++ b/Toolkit/ArcGISToolkit.xcodeproj/project.pbxproj @@ -513,7 +513,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 100.8; + MARKETING_VERSION = 100.9; PRODUCT_BUNDLE_IDENTIFIER = com.esri.ArcGISToolkit; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -539,7 +539,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 100.8; + MARKETING_VERSION = 100.9; PRODUCT_BUNDLE_IDENTIFIER = com.esri.ArcGISToolkit; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; From 9923de5ad6b7d8668e64553428d618ade550f750 Mon Sep 17 00:00:00 2001 From: Mark Dostal Date: Tue, 18 Aug 2020 13:41:45 -0500 Subject: [PATCH 4/4] Update README.md with SDK version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a010164..060bc916 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To use Toolkit in your project: * **[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. ## Requirements -* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.8.0 (or higher) +* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.9.0 (or higher) * Xcode 11.0 (or higher) 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.