Merge pull request #463 from Esri/philium/upgrade-project-version

philium · web-flow · commit 093d5100d34f · 2024-07-19T16:28:13.000-07:00
[Setup] Upgrade project format
diff --git a/Samples.xcodeproj/project.pbxproj b/Samples.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2844,7 +2844,7 @@
 					StyleSymbolsFromMobileStyleFile,
 				);
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1530;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = Esri;
 				TargetAttributes = {
 					00E5401227F3CCA200CF66D5 = {
@@ -2853,7 +2853,7 @@
 				};
 			};
 			buildConfigurationList = 00E5400A27F3CCA100CF66D5 /* Build configuration list for PBXProject "Samples" */;
-			compatibilityVersion = "Xcode 13.0";
+			compatibilityVersion = "Xcode 15.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -3236,6 +3236,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -3269,6 +3270,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -3295,6 +3297,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -3328,6 +3331,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
diff --git a/Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme b/Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.RoutePlannerView.swift b/Shared/Samples/Augment reality to navigate route/AugmentRealityToNavigateRouteView.RoutePlannerView.swift
@@ -156,15 +156,15 @@ private extension AugmentRealityToNavigateRouteView.RoutePlannerView {
         /// A point representing the start of navigation.
         var startPoint: Point? {
             didSet {
-                let stopSymbol = PictureMarkerSymbol(image: UIImage(named: "StopA")!)
+                let stopSymbol = PictureMarkerSymbol(image: .stopA)
                 let startStopGraphic = Graphic(geometry: startPoint, symbol: stopSymbol)
                 stopGraphicsOverlay.addGraphic(startStopGraphic)
             }
         }
         /// A point representing the destination of navigation.
         var endPoint: Point? {
             didSet {
-                let stopSymbol = PictureMarkerSymbol(image: UIImage(named: "StopB")!)
+                let stopSymbol = PictureMarkerSymbol(image: .stopB)
                 let endStopGraphic = Graphic(geometry: endPoint, symbol: stopSymbol)
                 stopGraphicsOverlay.addGraphic(endStopGraphic)
             }
diff --git a/Shared/Samples/Edit feature attachments/EditFeatureAttachmentsView.swift b/Shared/Samples/Edit feature attachments/EditFeatureAttachmentsView.swift
@@ -112,7 +112,7 @@ private extension EditFeatureAttachmentsView {
                     AddAttachmentView(onAdd: {
                         Task {
                             do {
-                                guard let pngData = UIImage(named: "PinBlueStar")?.pngData() else { return }
+                                guard let pngData = UIImage.pinBlueStar.pngData() else { return }
                                 try await model.addAttachment(
                                     named: "Attachment",
                                     type: "png",
diff --git a/Shared/Samples/Find address with reverse geocode/FindAddressWithReverseGeocodeView.swift b/Shared/Samples/Find address with reverse geocode/FindAddressWithReverseGeocodeView.swift
@@ -121,8 +121,8 @@ private extension FindAddressWithReverseGeocodeView {
         /// The red map marker graphic used to indicate a tap location on the map.
         let markerGraphic = {
             // Create a symbol using the image from the project assets.
-            guard let markerImage = UIImage(named: "RedMarker") else { return Graphic() }
-            let markerSymbol = PictureMarkerSymbol(image: markerImage)
+            let markerImage = UIImage.redMarker
+            let markerSymbol = PictureMarkerSymbol(image: .redMarker)
             
             // Change the symbol's offsets, so it aligns properly to a given point.
             markerSymbol.leaderOffsetY = markerImage.size.height / 2
diff --git a/Shared/Samples/Find route around barriers/FindRouteAroundBarriersView.Model.swift b/Shared/Samples/Find route around barriers/FindRouteAroundBarriersView.Model.swift
@@ -45,7 +45,7 @@ extension FindRouteAroundBarriersView {
         
         /// The blue marker symbol for the stop graphics.
         private let stopSymbol = {
-            let markerImage = UIImage(named: "BlueMarker")!
+            let markerImage = UIImage.blueMarker
             let markerSymbol = PictureMarkerSymbol(image: markerImage)
             markerSymbol.offsetY = markerImage.size.height / 2
             return markerSymbol
diff --git a/Shared/Samples/Find route in mobile map package/FindRouteInMobileMapPackageView.Models.swift b/Shared/Samples/Find route in mobile map package/FindRouteInMobileMapPackageView.Models.swift
@@ -88,7 +88,7 @@ extension FindRouteInMobileMapPackageView.MobileMapView {
         /// The blue marker symbol for creating a marker graphic.
         private let markerSymbol = {
             // Create a symbol using the Blue Marker image from the project's assets.
-            let markerImage = UIImage(named: "BlueMarker")!
+            let markerImage = UIImage.blueMarker
             let markerSymbol = PictureMarkerSymbol(image: markerImage)
             
             // Change the symbol's offsets, so it aligns properly to a given point.
diff --git a/Shared/Samples/Find route in transport network/FindRouteInTransportNetworkView.Model.swift b/Shared/Samples/Find route in transport network/FindRouteInTransportNetworkView.Model.swift
@@ -54,7 +54,7 @@ extension FindRouteInTransportNetworkView {
         
         /// The blue marker symbol for the stop graphics.
         private let markerSymbol = {
-            let markerImage = UIImage(named: "BlueMarker")!
+            let markerImage = UIImage.blueMarker
             let markerSymbol = PictureMarkerSymbol(image: markerImage)
             markerSymbol.offsetY = markerImage.size.height / 2
             return markerSymbol
diff --git a/Shared/Samples/Geocode offline/GeocodeOfflineView.Model.swift b/Shared/Samples/Geocode offline/GeocodeOfflineView.Model.swift
@@ -37,7 +37,7 @@ extension GeocodeOfflineView {
         /// The red map marker graphic used to indicate a given location on the map.
         private let markerGraphic = {
             // Create a symbol using the image from the project assets.
-            guard let markerImage = UIImage(named: "RedMarker") else { return Graphic() }
+            let markerImage = UIImage.redMarker
             let markerSymbol = PictureMarkerSymbol(image: markerImage)
             
             // Change the symbol's offsets, so it aligns properly to a given point.
diff --git a/Shared/Samples/Render multilayer symbols/RenderMultilayerSymbolsView.swift b/Shared/Samples/Render multilayer symbols/RenderMultilayerSymbolsView.swift
@@ -149,12 +149,10 @@ private extension RenderMultilayerSymbolsView {
         )
         
         // Create a pin graphic using an image in the project assets.
-        if let pinImage = UIImage(named: "PinBlueStar") {
-            let pinLayer = PictureMarkerSymbolLayer(image: pinImage)
-            graphics.append(
-                makeGraphicFromPictureMarkerSymbol(layer: pinLayer, offset: 40)
-            )
-        }
+        let pinLayer = PictureMarkerSymbolLayer(image: .pinBlueStar)
+        graphics.append(
+            makeGraphicFromPictureMarkerSymbol(layer: pinLayer, offset: 40)
+        )
         
         return graphics
     }
diff --git a/Shared/Samples/Show service area/ShowServiceAreaView.swift b/Shared/Samples/Show service area/ShowServiceAreaView.swift
@@ -114,7 +114,7 @@ private extension ShowServiceAreaView {
         
         private let facilitiesGraphicsOverlay: GraphicsOverlay = {
             let facilitiesGraphicsOverlay = GraphicsOverlay()
-            let facilitySymbol = PictureMarkerSymbol(image: UIImage(named: "PinBlueStar")!)
+            let facilitySymbol = PictureMarkerSymbol(image: .pinBlueStar)
             // Offsets symbol in Y to align image properly.
             facilitySymbol.offsetY = 21
             // Assigns renderer on facilities graphics overlay using the picture marker symbol.
diff --git a/Shared/Samples/Style point with picture marker symbols/StylePointWithPictureMarkerSymbolsView.swift b/Shared/Samples/Style point with picture marker symbols/StylePointWithPictureMarkerSymbolsView.swift
@@ -38,10 +38,8 @@ struct StylePointWithPictureMarkerSymbolsView: View {
     /// Creates a picture marker symbol from an image in the project assets.
     /// - Returns: A picture marker symbol
     private static func makePictureMarkerSymbolFromImage() -> Graphic {
-        let imageName = "PinBlueStar"
-        
         // Create pin symbol using the image.
-        let pinSymbol = PictureMarkerSymbol(image: UIImage(named: imageName)!)
+        let pinSymbol = PictureMarkerSymbol(image: .pinBlueStar)
         
         // Change offsets, so the symbol aligns properly to the point.
         pinSymbol.offsetY = pinSymbol.image!.size.height / 2

Original file line number	Diff line number	Diff line change
`@@ -156,15 +156,15 @@ private extension AugmentRealityToNavigateRouteView.RoutePlannerView {`
`156`	`156`	`/// A point representing the start of navigation.`
`157`	`157`	`var startPoint: Point? {`
`158`	`158`	`didSet {`
`159`		`- let stopSymbol = PictureMarkerSymbol(image: UIImage(named: "StopA")!)`
	`159`	`+ let stopSymbol = PictureMarkerSymbol(image: .stopA)`
`160`	`160`	`let startStopGraphic = Graphic(geometry: startPoint, symbol: stopSymbol)`
`161`	`161`	`stopGraphicsOverlay.addGraphic(startStopGraphic)`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`	`/// A point representing the destination of navigation.`
`165`	`165`	`var endPoint: Point? {`
`166`	`166`	`didSet {`
`167`		`- let stopSymbol = PictureMarkerSymbol(image: UIImage(named: "StopB")!)`
	`167`	`+ let stopSymbol = PictureMarkerSymbol(image: .stopB)`
`168`	`168`	`let endStopGraphic = Graphic(geometry: endPoint, symbol: stopSymbol)`
`169`	`169`	`stopGraphicsOverlay.addGraphic(endStopGraphic)`
`170`	`170`	`}`