chore: Add @mainactor annotations for Swift 6 concurrency [Phase 2] (#254)

iHackSubhodip · web-flow · commit d712a9c854d4 · 2026-05-13T13:43:40.000+01:00
Continues Swift 6 concurrency migration by adding @mainactor annotations to delegate implementations and UI-related classes
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/AnimatedCurrentLocationViewController.swift
@@ -70,7 +70,7 @@ final class AnimatedCurrentLocationViewController: UIViewController {
   }
 }
 
-extension AnimatedCurrentLocationViewController: CLLocationManagerDelegate {
+extension AnimatedCurrentLocationViewController: @MainActor CLLocationManagerDelegate {
   func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
     if locationManager.authorizationStatus == .denied {
       print("Please authorize location services")
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/CustomIndoorViewController.swift
@@ -64,7 +64,7 @@ class CustomIndoorViewController: UIViewController {
 
 }
 
-extension CustomIndoorViewController: GMSIndoorDisplayDelegate {
+extension CustomIndoorViewController: @MainActor GMSIndoorDisplayDelegate {
 
   func didChangeActiveBuilding(_ building: GMSIndoorBuilding?) {
     guard let building = building else {
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingBasicViewController.swift
@@ -32,13 +32,15 @@ private struct FeatureLayerConfig {
   let highlightPlaceID: String
 }
 
+@MainActor
 private class SliderControls {
   let view: UIStackView
   let fillColor: UISlider
   let strokeColor: UISlider
   let strokeWidth: UISlider
   let label: UILabel
 
+  @MainActor
   private static func addSliderAndLabel(to parent: UIStackView, text: String, initialValue: Float)
     -> UISlider
   {
diff --git a/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift b/GoogleMaps-Swift/GoogleMapsSwiftXCFrameworkDemos/Swift/Samples/DataDrivenStylingSearchViewController.swift
@@ -50,6 +50,7 @@ private struct PlaceTextSearchResponse: Codable {
   let places: [Place]
 }
 
+@MainActor
 private class PlaceLookupController: NSObject {
   let serial: Int
   let controller: DataDrivenStylingSearchViewController

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ final class AnimatedCurrentLocationViewController: UIViewController {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`-extension AnimatedCurrentLocationViewController: CLLocationManagerDelegate {`
	`73`	`+extension AnimatedCurrentLocationViewController: @MainActor CLLocationManagerDelegate {`
`74`	`74`	`func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {`
`75`	`75`	`if locationManager.authorizationStatus == .denied {`
`76`	`76`	`print("Please authorize location services")`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class CustomIndoorViewController: UIViewController {`
`64`	`64`
`65`	`65`	`}`
`66`	`66`
`67`		`-extension CustomIndoorViewController: GMSIndoorDisplayDelegate {`
	`67`	`+extension CustomIndoorViewController: @MainActor GMSIndoorDisplayDelegate {`
`68`	`68`
`69`	`69`	`func didChangeActiveBuilding(_ building: GMSIndoorBuilding?) {`
`70`	`70`	`guard let building = building else {`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,15 @@ private struct FeatureLayerConfig {`
`32`	`32`	`let highlightPlaceID: String`
`33`	`33`	`}`
`34`	`34`
	`35`	`+@MainActor`
`35`	`36`	`private class SliderControls {`
`36`	`37`	`let view: UIStackView`
`37`	`38`	`let fillColor: UISlider`
`38`	`39`	`let strokeColor: UISlider`
`39`	`40`	`let strokeWidth: UISlider`
`40`	`41`	`let label: UILabel`
`41`	`42`
	`43`	`+ @MainActor`
`42`	`44`	`private static func addSliderAndLabel(to parent: UIStackView, text: String, initialValue: Float)`
`43`	`45`	`-> UISlider`
`44`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ private struct PlaceTextSearchResponse: Codable {`
`50`	`50`	`let places: [Place]`
`51`	`51`	`}`
`52`	`52`
	`53`	`+@MainActor`
`53`	`54`	`private class PlaceLookupController: NSObject {`
`54`	`55`	`let serial: Int`
`55`	`56`	`let controller: DataDrivenStylingSearchViewController`