[release/v11.2.0-rc.1] Release 11.2.0-rc.1 (#2035)

* Fix changelog

* Fix case when the map is dragged inside scroll view (#2024)

* Add Example

* Fix grammar

Co-authored-by: Patrick Leonard <[email protected]>

* pin xcodegen at 2.38 due to crash

* Bump xcode version to 14.3

* Remove swift 5.8 version checks

* Fix spelling of visionOS

* Update visionOS icon

* Remove Studio Preview build job from release pipeline (#2016)

* Remove build-studio-preview step permanently

* Remove the actual script

* Bump versions

* Delete main sections from chagelog

---------

Co-authored-by: Patrick Leonard <[email protected]>
Co-authored-by: Ivan Persidsky <[email protected]>
Co-authored-by: Alex Azarov <[email protected]>

Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "f7804e860a7d99fac4aafda0bd790eee76150e6c",
-        "version" : "24.2.0-beta.1"
+        "revision" : "f082e51e09fc01bd0457e692807fffd2955fe12a",
+        "version" : "24.2.0-rc.2"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "6f1e56f01edb6145b9229f6eb4cd6c0557b647ac",
-        "version" : "11.2.0-beta.1"
+        "revision" : "cb02b9f9f2909b309e9f2374783ca090c1029c95",
+        "version" : "11.2.0-rc.1"
       }
     },
     {

Apps/Examples/Examples.xcodeproj/project.pbxproj

@@ -585,32 +585,32 @@
 			path = Lab;
 			sourceTree = "<group>";
 		};
-		"TEMP_3B399F92-9D2B-4B38-A72E-02B19CD823AB" /* iOS */ = {
+		"TEMP_013830E3-5FCE-44E9-8BF3-7C01A1C051FA" /* SwiftUI */ = {
 			isa = PBXGroup;
 			children = (
 			);
-			path = iOS;
+			path = SwiftUI;
 			sourceTree = "<group>";
 		};
-		"TEMP_8F646053-4581-430A-9178-24F6E0EB7E54" /* All Examples */ = {
+		"TEMP_1B6054FA-B5A0-4568-84CF-0833D368F91A" /* Sample Data */ = {
 			isa = PBXGroup;
 			children = (
 			);
-			path = "All Examples";
+			path = "Sample Data";
 			sourceTree = "<group>";
 		};
-		"TEMP_A6BB9FB3-8D52-4322-AA5D-8B6664BE3F84" /* Sample Data */ = {
+		"TEMP_7C36F109-1AA0-40A1-A53F-E0434C79F8F8" /* All Examples */ = {
 			isa = PBXGroup;
 			children = (
 			);
-			path = "Sample Data";
+			path = "All Examples";
 			sourceTree = "<group>";
 		};
-		"TEMP_CA00C26A-3392-4E3B-88F3-A1B0437407E6" /* SwiftUI */ = {
+		"TEMP_CFF36C10-66CE-4EFB-BCF3-8D7E95385E78" /* iOS */ = {
 			isa = PBXGroup;
 			children = (
 			);
-			path = SwiftUI;
+			path = iOS;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -1046,7 +1046,7 @@
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.7;
+				SWIFT_VERSION = 5.8;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
@@ -1178,7 +1178,7 @@
 				SUPPORTS_MACCATALYST = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 5.7;
+				SWIFT_VERSION = 5.8;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				XROS_DEPLOYMENT_TARGET = 1.0;
 			};

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "back.png",
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Back.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Contents.json

@@ -0,0 +1,17 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "layers" : [
+    {
+      "filename" : "Front.solidimagestacklayer"
+    },
+    {
+      "filename" : "Middle.solidimagestacklayer"
+    },
+    {
+      "filename" : "Back.solidimagestacklayer"
+    }
+  ]
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "star.png",
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Front.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "filename" : "middle.png",
+      "idiom" : "vision",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/Assets.xcassets/AppIcon.solidimagestack/Middle.solidimagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Apps/Examples/Examples/SwiftUI Examples/Testing Examples/MapScrollExample.swift

@@ -0,0 +1,28 @@
+import Foundation
+import SwiftUI
+@_spi(Experimental) import MapboxMaps
+
+@available(iOS 14.0, *)
+struct MapScrollExample: View {
+    var body: some View {
+        List {
+            Section {
+                Text("Test Map behaviour inside scroll.")
+                    .font(.title)
+                    .bold()
+            }
+            Section {
+                Map(initialViewport: .followPuck(zoom: 18, bearing: .heading, pitch: 60)) {
+                    Puck2D(bearing: .heading)
+                }.aspectRatio(1.0, contentMode: .fill)
+            }
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+struct MapScrollExample_Previews: PreviewProvider {
+    static var previews: some View {
+        MapScrollExample()
+    }
+}

CHANGELOG.md

@@ -2,13 +2,18 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
-## main
+## 11.2.0-rc.1 - 15 February, 2024
+
+### Bug fixes 🐞
+
+* Fix Map and encompassing List scroll at the same time
+* visionOS small enhancements
 
 ## 11.2.0-beta.1 - 1 February, 2024
 
 ### Features ✨ and improvements 🏁
 
-* Vision OS support. 🚀
+* vision OS support. 🚀
 * Add easing curve parameter to `CameraAnimationsManager.fly(to:duration:curve:completion)`, make `TimingCurve` public with few more options.
 * Expose `MapboxMap.centerAltitudeMode` and ensure correct `centerAltitudeMode` on gesture ending.
 * Expose extra configuration methods for `MapboxMap`: `setNorthOrientation(_:)`, `setConstrainMode(_:)` and `setViewportMode(_:)`.

MapboxMaps.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '11.2.0-beta.1'
+  maps_version = '11.2.0-rc.1'
 
   m.name = 'MapboxMaps'
   m.version = maps_version
@@ -16,13 +16,13 @@ Pod::Spec.new do |m|
   m.source = { :git => 'https://github.com/mapbox/mapbox-maps-ios.git', :tag => "v#{maps_version}" }
   m.platform = :ios
   m.ios.deployment_target = '12.0'
-  m.swift_version = '5.7'
+  m.swift_version = '5.8'
 
   m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}'
   m.resource_bundles = { 'MapboxMapsResources' => ['Sources/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json', 'Sources/MapboxMaps/PrivacyInfo.xcprivacy'] }
 
-  m.dependency 'MapboxCoreMaps', '11.2.0-beta.1'
-  m.dependency 'MapboxCommon', '24.2.0-beta.1'
+  m.dependency 'MapboxCoreMaps', '11.2.0-rc.1'
+  m.dependency 'MapboxCommon', '24.2.0-rc.2'
   m.dependency 'Turf', '2.8.0'
 
 end

Package.resolved

@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "f7804e860a7d99fac4aafda0bd790eee76150e6c",
-        "version" : "24.2.0-beta.1"
+        "revision" : "f082e51e09fc01bd0457e692807fffd2955fe12a",
+        "version" : "24.2.0-rc.2"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "6f1e56f01edb6145b9229f6eb4cd6c0557b647ac",
-        "version" : "11.2.0-beta.1"
+        "revision" : "cb02b9f9f2909b309e9f2374783ca090c1029c95",
+        "version" : "11.2.0-rc.1"
       }
     },
     {

Package.swift

@@ -1,10 +1,11 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.8
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.2.0-beta.1")
-let common = MapsDependency.common(version: "24.2.0-beta.1")
+let coreMaps = MapsDependency.coreMaps(version: "11.2.0-rc.1")
+let common = MapsDependency.common(version: "24.2.0-rc.2")
 
 let mapboxMapsPath: String? = nil