Merge pull request #542 from Esri/v.next

[Release] 200.6.0

Author: CalebRas

.gitignore

@@ -36,3 +36,6 @@ Package.resolved
 ## Python build artifact
 # If the style check scripts are run locally, ignore the script build artifact.
 Scripts/CI/__pycache__/
+
+## SwiftLint Analyzer Log
+.xcodebuild.log

.swiftlint.yml

@@ -73,6 +73,11 @@ opt_in_rules:
   - vertical_whitespace_closing_braces
   - vertical_whitespace_opening_braces
   - yoda_condition
+  
+analyzer_rules:
+  - typesafe_array_init
+  - unused_declaration
+  - unused_import
 
 attributes:
   attributes_with_arguments_always_on_line_above: false

Documentation/ConfigureAppSecrets.md

@@ -12,7 +12,7 @@ Note: License strings are not required for development. Without licensing or lic
   touch .secrets
   ```
 
-2. Add your **License String** to the secrets file. Licensing the app will remove the 'Licensed for Developer Use Only' watermark. Licensing the app is optional in development but required for production. Add your **Extension License String** and **API Key** access token to the secrets file if needed. Learn more about how to [Get a license](https://developers.arcgis.com/swift/license-and-deployment/get-a-license/).
+2. Add your **License String** to the secrets file. Licensing the app will remove the 'Licensed for Developer Use Only' watermark. Licensing the app is optional in development but required for production. Add your **Extension License String** and **API Key** access token to the secrets file if needed. If the license string is set, an **Advanced Editing** extension will be required to access all the samples, such as those with utility network capabilities. Learn more about how to [Get a license](https://developers.arcgis.com/swift/license-and-deployment/get-a-license/).
 
   ```sh
   echo ARCGIS_LICENSE_KEY=your-license-key >> .secrets

README.md

@@ -18,9 +18,9 @@ This repository contains Swift sample code demonstrating the capabilities of the
 
 ## Requirements
 
-* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.5 (or newer)
-* [ArcGIS Maps SDK for Swift Toolkit](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit) 200.5 (or newer)
-* Xcode 15.0 (or newer)
+* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.6 (or newer)
+* [ArcGIS Maps SDK for Swift Toolkit](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit) 200.6 (or newer)
+* Xcode 16.0 (or newer)
 
 The *ArcGIS Maps SDK for Swift Samples app* has a *Target SDK* version of *16.0*, meaning that it can run on devices with *iOS 16.0* or newer.
 

Samples.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme

@@ -87,7 +87,8 @@ func name(ofFileInArchiveAt url: URL) throws -> String {
     process.waitUntilExit()
 
     let filenameData = outputPipe.fileHandleForReading.readDataToEndOfFile()
-    return String(data: filenameData, encoding: .utf8)!.trimmingCharacters(in: .whitespacesAndNewlines)
+    // swiftlint:disable:next optional_data_string_conversion
+    return String(decoding: filenameData, as: UTF8.self).trimmingCharacters(in: .whitespacesAndNewlines)
 }
 
 /// Counts files in a ZIP archive.
@@ -108,7 +109,8 @@ func count(ofFilesInArchiveAt url: URL) throws -> Int {
     // To extract the count, cut the string at the first whitespace.
     let totalsInfo = outputPipe.fileHandleForReading.readDataToEndOfFile()
     // `UInt8(32)` is space in ASCII.
-    let totalsCount = String(data: totalsInfo.prefix(while: { $0 != 32 }), encoding: .utf8)!
+    // swiftlint:disable:next optional_data_string_conversion
+    let totalsCount = String(decoding: totalsInfo.prefix(while: { $0 != 32 }), as: UTF8.self)
     return Int(totalsCount)!
 }
 

Scripts/DowloadPortalItemData.swift

@@ -111,7 +111,6 @@ private let sampleMetadata: [SampleMetadata] = {
                     exit(1)
                 }
             }
-            .sorted { $0.title < $1.title }
     } catch {
         print("error: Decoding Samples: \(error.localizedDescription)")
         exit(1)
@@ -123,6 +122,7 @@ private let sampleStructs = sampleMetadata
         let portalItemIDs = (sample.offlineData ?? [])
             .map { #"PortalItem.ID("\#($0)")!"# }
         return """
+        \(sample.category == "Augmented Reality" ? "@available(macCatalyst, unavailable)" : "")
         struct \(sample.structName): Sample {
             var name: String { \"\(sample.title)\" }
             var category: String { \"\(sample.category)\" }
@@ -136,25 +136,44 @@ private let sampleStructs = sampleMetadata
     }
     .joined(separator: "\n")
 
-private let entries = sampleMetadata
+// The set of samples supported on all supported platforms.
+private let commonSamples = sampleMetadata
+    .filter { $0.category != "Augmented Reality" }
     .map { sample in "\(sample.structName)()" }
-    .joined(separator: ",\n        ")
-private let arrayRepresentation = """
+    .joined(separator: ",\n            ")
+
+// The set of samples supported only on iOS.
+private let iOSSpecificSamples = sampleMetadata
+    .filter { $0.category == "Augmented Reality" }
+    .map { sample in "\(sample.structName)()" }
+    .joined(separator: ",\n                ")
+
+private let commonSamplesArrayRepresentation = """
     [
-            \(entries)
-        ]
-    #if targetEnvironment(macCatalyst) || targetEnvironment(simulator)
-        // Exclude AR samples from Mac Catalyst and Simulator targets
-        // as they don't have camera and sensors available.
-        .filter { $0.category != "Augmented Reality" }
+                \(commonSamples)
+            ]
+    """
+
+private let iOSSamplesArrayRepresentation = """
+    {
+    #if !targetEnvironment(macCatalyst) && !targetEnvironment(simulator)
+                // Exclude AR samples from Mac Catalyst and Simulator targets
+                // as they don't have camera and sensors available.
+                [
+                    \(iOSSpecificSamples)
+                ]
+    #else
+                []
     #endif
+            }()
     """
 
 do {
     let templateFile = try String(contentsOf: templateURL, encoding: .utf8)
     // Replaces the empty array code stub, i.e. [], with the array representation.
     let content = templateFile
-        .replacingOccurrences(of: "[/* samples */]", with: arrayRepresentation)
+        .replacingOccurrences(of: "[/* common_samples */]", with: commonSamplesArrayRepresentation)
+        .replacingOccurrences(of: "[/* ios_samples */]", with: iOSSamplesArrayRepresentation)
         .replacingOccurrences(of: "/* structs */", with: sampleStructs)
     try content.write(to: outputFileURL, atomically: true, encoding: .utf8)
 } catch {

Scripts/GenerateSampleViewSourceCode.swift

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from common import *
+from CI.common import *
 import argparse
 
 

Scripts/CI/create-metadata-from-README.py Scripts/create-metadata-from-README.pyScripts/CI/create-metadata-from-README.py renamed to Scripts/create-metadata-from-README.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Copyright 2024 Esri
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# set -xv # uncomment for debugging
+
+# Variables ::
+build_destination="generic/platform=iOS Simulator"
+log_name=.xcodebuild.log
+
+# Delete derived data. Otherwise, SwiftLint won't find any files to analyze.
+rm -rf ~/Library/Developer/Xcode/DerivedData
+
+# Go to project root directory.
+cd "$(dirname "$0")/.."
+
+echo "Building '$log_name'"
+xcodebuild -project Samples.xcodeproj -scheme Samples -destination "$build_destination" > $log_name
+
+swiftlint analyze --compiler-log-path $log_name
+
+rm $log_name