Merge pull request #403 from Esri/v.next

Merge v.next into main for 200.2
Esri · Aug 16, 2023 · 5ea1271 · 5ea1271
2 parents f75f901 + 88545af
commit 5ea1271
Show file tree

Hide file tree

Showing 231 changed files with 5,353 additions and 2,064 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -28,7 +28,6 @@ disabled_rules:
 
 # Some rules are only opt-in
 opt_in_rules: 
-  - anyobject_protocol
   - array_init
   - attributes
   - closure_end_indentation

diff --git a/AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj b/AuthenticationExample/AuthenticationExample.xcodeproj/project.pbxproj
@@ -325,7 +325,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.1.0;
+				MARKETING_VERSION = 200.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -358,7 +358,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 200.1.0;
+				MARKETING_VERSION = 200.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.esri.Authentication;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/AuthenticationExample/AuthenticationExample/SignInView.swift b/AuthenticationExample/AuthenticationExample/SignInView.swift
@@ -132,7 +132,7 @@ private extension Error {
     /// authentication challenge.
     var isChallengeCancellationError: Bool {
         switch self {
-        case is CancellationError:
+        case is ArcGISChallengeCancellationError:
             return true
         case let error as NSError:
             return error.domain == NSURLErrorDomain && error.code == -999

diff --git a/Documentation/Authenticator/README.md b/Documentation/Authenticator/README.md
diff --git a/Documentation/BasemapGallery/README.md b/Documentation/BasemapGallery/README.md
diff --git a/Documentation/Bookmarks/README.md b/Documentation/Bookmarks/README.md