Swift 6 support for interstitial examples

PiperOrigin-RevId: 711776489
googleads · Jan 3, 2025 · 47add97 · 47add97
1 parent b756519
commit 47add97
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/...nager/AdManagerInterstitialExample/AdManagerInterstitialExample.xcodeproj/project.pbxproj b/...nager/AdManagerInterstitialExample/AdManagerInterstitialExample.xcodeproj/project.pbxproj
@@ -284,7 +284,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.ads.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -304,7 +304,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.ads.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};

diff --git a/...nagerInterstitialExample/AdManagerInterstitialExample/GoogleMobileAdsConsentManager.swift b/...nagerInterstitialExample/AdManagerInterstitialExample/GoogleMobileAdsConsentManager.swift
@@ -23,6 +23,7 @@ import UserMessagingPlatform
 /// consent for users in GDPR impacted countries. This is an example and
 /// you can choose another consent management platform to capture consent.
 
+@MainActor
 class GoogleMobileAdsConsentManager: NSObject {
   static let shared = GoogleMobileAdsConsentManager()
 
@@ -54,7 +55,7 @@ class GoogleMobileAdsConsentManager: NSObject {
         return consentGatheringComplete(requestConsentError)
       }
 
-      Task { @MainActor in
+      Task {
         do {
           try await UMPConsentForm.loadAndPresentIfRequired(from: viewController)
           // Consent has been gathered.

diff --git a/.../admanager/AdManagerInterstitialExample/AdManagerInterstitialExample/ViewController.swift b/.../admanager/AdManagerInterstitialExample/AdManagerInterstitialExample/ViewController.swift
@@ -14,10 +14,10 @@
 //  limitations under the License.
 //
 
-import GoogleMobileAds
+@preconcurrency import GoogleMobileAds
 import UIKit
 
-class ViewController: UIViewController, GADFullScreenContentDelegate {
+class ViewController: UIViewController, @preconcurrency GADFullScreenContentDelegate {
 
   enum GameState: NSInteger {
     case notStarted

diff --git a/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj b/Swift/admob/InterstitialExample/InterstitialExample.xcodeproj/project.pbxproj
@@ -292,7 +292,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.ads.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -312,7 +312,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.google.ads.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};

diff --git a/Swift/admob/InterstitialExample/InterstitialExample/GoogleMobileAdsConsentManager.swift b/Swift/admob/InterstitialExample/InterstitialExample/GoogleMobileAdsConsentManager.swift
@@ -23,6 +23,7 @@ import UserMessagingPlatform
 /// consent for users in GDPR impacted countries. This is an example and
 /// you can choose another consent management platform to capture consent.
 
+@MainActor
 class GoogleMobileAdsConsentManager: NSObject {
   static let shared = GoogleMobileAdsConsentManager()
 
@@ -54,7 +55,7 @@ class GoogleMobileAdsConsentManager: NSObject {
         return consentGatheringComplete(requestConsentError)
       }
 
-      Task { @MainActor in
+      Task {
         do {
           try await UMPConsentForm.loadAndPresentIfRequired(from: viewController)
           // Consent has been gathered.

diff --git a/Swift/admob/InterstitialExample/InterstitialExample/ViewController.swift b/Swift/admob/InterstitialExample/InterstitialExample/ViewController.swift
@@ -14,10 +14,10 @@
 //  limitations under the License.
 //
 
-import GoogleMobileAds
+@preconcurrency import GoogleMobileAds
 import UIKit
 
-class ViewController: UIViewController, GADFullScreenContentDelegate {
+class ViewController: UIViewController, @preconcurrency GADFullScreenContentDelegate {
 
   enum GameState: NSInteger {
     case notStarted