Migration to SDK v10 (10.4.0)

ios/documentation/changelog.md

@@ -1,13 +1,20 @@
 # Change Log
 
+### v6.0.0
+- Migration to SDK v10 (https://developers.google.com/admob/ios/migration#migrate-to-sdk-v10)
+- Update Google Mobile Ads SDK 10.4.0 (https://github.com/CocoaPods/Specs/tree/master/Specs/5/9/a/Google-Mobile-Ads-SDK/10.4.0)
+- Update Meta Adapter 6.12.0.1 (https://developers.google.com/admob/ios/mediation/meta#version-6.12.0.1)
+- Update InMobi SDK 10.1.3 (https://support.inmobi.com/monetize/sdk-documentation/download-sdk)
+- Update InMobiAdapter 10.1.2.1 (https://developers.google.com/admob/ios/mediation/inmobi#version-10.1.2.1_1)
+
 ### v5.1.0
 - Removed the FBLPromises framework
 - Added sample demo app: https://github.com/Astrovic/ti.admob-sample-app/
 - Minor fixes
 
 ### v5.0.0
 - Migration to SDK v9 (https://developers.google.com/admob/ios/migration):
-- Update Google Mobile Ads SDK 9.13.0 (https://github.com/CocoaPods/Specs/tree/master/Specs/5/9/a/Google-Mobile-Ads-SDK/9.13.0
+- Update Google Mobile Ads SDK 9.13.0 (https://github.com/CocoaPods/Specs/tree/master/Specs/5/9/a/Google-Mobile-Ads-SDK/9.13.0)
 - Update Audience Network SDK 6.12.0 (https://developers.facebook.com/docs/audience-network/setting-up/platform-setup/ios/add-sdk)
 - Added Meta Adapter 6.12.0.0 (https://developers.google.com/admob/ios/mediation/meta#facebook-ios-mediation-adapter-changelog)
 - Removed Facebook Adapter 6.9.0.0 (https://developers.google.com/admob/ios/mediation/facebook#facebook-ios-mediation-adapter-changelog)- 

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.1.0
+version: 6.0.0
 architectures: arm64 x86_64
 mac: false
 description: AdMob module for ad delivery via AdMob

ios/platform/GoogleAppMeasurement.xcframework/Info.plist

@@ -19,22 +19,23 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>ios-arm64_i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurement.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>i386</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
 			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurement.framework</string>
 			<key>SupportedArchitectures</key>
@@ -43,7 +44,9 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -59,7 +62,7 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurement.framework</string>
 			<key>SupportedArchitectures</key>
@@ -68,25 +71,22 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
 			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_i386_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurement.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>i386</string>
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

ios/platform/GoogleAppMeasurement.xcframework/ios-arm64_armv7/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurement.xcframework/ios-arm64_i386_x86_64-simulator/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurement.xcframework/ios-arm64_x86_64-maccatalyst/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurement.xcframework/macos-arm64_x86_64/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurement.xcframework/tvos-arm64/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurement.xcframework/tvos-arm64_x86_64-simulator/GoogleAppMeasurement.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/Info.plist

@@ -35,19 +35,22 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurementIdentitySupport.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurementIdentitySupport.framework</string>
 			<key>SupportedArchitectures</key>
@@ -56,9 +59,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -77,16 +78,15 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>GoogleAppMeasurementIdentitySupport.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>tvos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/ios-arm64_armv7/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/ios-arm64_i386_x86_64-simulator/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/ios-arm64_x86_64-maccatalyst/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/macos-arm64_x86_64/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/tvos-arm64/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleAppMeasurementIdentitySupport.xcframework/tvos-arm64_x86_64-simulator/GoogleAppMeasurementIdentitySupport.framework/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleVersion</key>
-	<string>8.15.0</string>
+	<string>10.6.0</string>
 	<key>DTSDKName</key>
 	<string>iphonesimulator11.2</string>
 </dict>

ios/platform/GoogleMobileAds.xcframework/Info.plist

@@ -6,31 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>GoogleMobileAds.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_armv7</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>GoogleMobileAds.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>armv7</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

ios/platform/GoogleMobileAds.xcframework/ios-arm64/GoogleMobileAds.framework/Headers/GADAdChoicesView.h

@@ -0,0 +1,16 @@
+//
+//  GADAdChoicesView.h
+//  Google Mobile Ads SDK
+//
+//  Copyright 2016 Google LLC. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+/// Displays AdChoices content.
+///
+/// If a GADAdChoicesView is set on GADNativeAdView prior to calling -setNativeAd:, AdChoices
+/// content will render inside the GADAdChoicesView. By default, AdChoices is placed in the top
+/// right corner of GADNativeAdView.
+@interface GADAdChoicesView : UIView
+@end

ios/platform/GoogleMobileAds.xcframework/ios-arm64/GoogleMobileAds.framework/Headers/GADAdFormat.h

@@ -0,0 +1,19 @@
+//
+//  GADAdFormat.h
+//  Google Mobile Ads SDK
+//
+//  Copyright 2018-2022 Google LLC. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/// Requested ad format.
+typedef NS_ENUM(NSInteger, GADAdFormat) {
+  GADAdFormatBanner,                ///< Banner.
+  GADAdFormatInterstitial,          ///< Interstitial.
+  GADAdFormatRewarded,              ///< Rewarded.
+  GADAdFormatNative,                ///< Native.
+  GADAdFormatRewardedInterstitial,  ///< Rewarded interstitial.
+  GADAdFormatUnknown,               ///< Unknown.
+  GADAdFormatAppOpen,               ///< App open.
+};

ios/platform/GoogleMobileAds.xcframework/ios-arm64/GoogleMobileAds.framework/Headers/GADAdLoader.h

@@ -0,0 +1,46 @@
+//
+//  GADAdLoader.h
+//  Google Mobile Ads SDK
+//
+//  Copyright 2015 Google LLC. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <GoogleMobileAds/GADAdLoaderAdTypes.h>
+#import <GoogleMobileAds/GADAdLoaderDelegate.h>
+#import <GoogleMobileAds/GADRequest.h>
+#import <UIKit/UIKit.h>
+
+/// Ad loader options base class. See each ad type's header for available GADAdLoaderOptions
+/// subclasses.
+@interface GADAdLoaderOptions : NSObject
+@end
+
+/// Loads ads. See GADAdLoaderAdTypes.h for available ad types.
+@interface GADAdLoader : NSObject
+
+/// Object notified when an ad request succeeds or fails. Must conform to requested ad types'
+/// delegate protocols.
+@property(nonatomic, weak, nullable) id<GADAdLoaderDelegate> delegate;
+
+/// The ad loader's ad unit ID.
+@property(nonatomic, readonly, nonnull) NSString *adUnitID;
+
+/// Indicates whether the ad loader is loading.
+@property(nonatomic, getter=isLoading, readonly) BOOL loading;
+
+/// Returns an initialized ad loader configured to load the specified ad types.
+///
+/// @param rootViewController The root view controller is used to present ad click actions.
+/// @param adTypes An array of ad types. See GADAdLoaderAdTypes.h for available ad types.
+/// @param options An array of GADAdLoaderOptions objects to configure how ads are loaded, or nil
+/// to use default options. See each ad type's header for available GADAdLoaderOptions subclasses.
+- (nonnull instancetype)initWithAdUnitID:(nonnull NSString *)adUnitID
+                      rootViewController:(nullable UIViewController *)rootViewController
+                                 adTypes:(nonnull NSArray<GADAdLoaderAdType> *)adTypes
+                                 options:(nullable NSArray<GADAdLoaderOptions *> *)options;
+
+/// Loads the ad and informs the delegate of the outcome.
+- (void)loadRequest:(nullable GADRequest *)request;
+
+@end