diff --git a/packages/google_mobile_ads/example/ios/Podfile b/packages/google_mobile_ads/example/ios/Podfile index 0d0a36ca6..1cad84c20 100644 --- a/packages/google_mobile_ads/example/ios/Podfile +++ b/packages/google_mobile_ads/example/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '11.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/packages/google_mobile_ads/example/ios/Runner.xcodeproj/project.pbxproj b/packages/google_mobile_ads/example/ios/Runner.xcodeproj/project.pbxproj index 10ad8639f..3d588697c 100644 --- a/packages/google_mobile_ads/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/google_mobile_ads/example/ios/Runner.xcodeproj/project.pbxproj @@ -170,6 +170,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 194BB02CA5CDABA098EA0B10 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; 5B6AAA352BAC85BF7DD68C46 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -222,6 +229,7 @@ 9E61AA1729BBE51900801A83 /* RunnerTests */, 97C146EF1CF9000F007C117D /* Products */, 5B6AAA352BAC85BF7DD68C46 /* Frameworks */, + 194BB02CA5CDABA098EA0B10 /* Pods */, ); sourceTree = ""; }; @@ -400,7 +408,8 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -592,6 +601,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -649,6 +659,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 = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -678,7 +689,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -705,7 +716,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -730,6 +741,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; @@ -755,6 +767,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.1; diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsReaderWriterTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsReaderWriterTest.m index e48e6e9a0..e60d75356 100644 --- a/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsReaderWriterTest.m +++ b/packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsReaderWriterTest.m @@ -563,7 +563,8 @@ - (void)testEncodeDecodeFLTGADResponseInfo { - (void)testEncodeDecodeFLTGADLoadErrorWithEmptyValues { GADResponseInfo *mockResponseInfo = OCMClassMock([GADResponseInfo class]); OCMStub([mockResponseInfo responseIdentifier]).andReturn(nil); - OCMStub([mockResponseInfo adNetworkClassName]).andReturn(nil); + OCMStub([mockResponseInfo.loadedAdNetworkResponseInfo adNetworkClassName]) + .andReturn(nil); NSDictionary *userInfo = @{ NSLocalizedDescriptionKey : @"message", GADErrorUserInfoKeyResponseInfo : mockResponseInfo diff --git a/packages/google_mobile_ads/example/ios/RunnerTests/FLTNativeAdTest.m b/packages/google_mobile_ads/example/ios/RunnerTests/FLTNativeAdTest.m index 2bd82573b..4c3b8cb29 100644 --- a/packages/google_mobile_ads/example/ios/RunnerTests/FLTNativeAdTest.m +++ b/packages/google_mobile_ads/example/ios/RunnerTests/FLTNativeAdTest.m @@ -52,7 +52,7 @@ - (void)testLoadNativeAd:(FLTAdRequest *)gadOrGAMRequest GADAdLoaderOptions *mockGADAdLoaderOptions = OCMClassMock([GADAdLoaderOptions class]); OCMStub([mockNativeAdOptions asGADAdLoaderOptions]) - .andReturn(mockGADAdLoaderOptions); + .andReturn([NSArray arrayWithObject:mockGADAdLoaderOptions]); UIViewController *mockViewController = OCMClassMock([UIViewController class]); FLTNativeAd *ad = [[FLTNativeAd alloc] initWithAdUnitId:@"testAdUnitId" @@ -162,7 +162,7 @@ - (void)testLoadNativeAdNativeTemplateStyle { GADAdLoaderOptions *mockGADAdLoaderOptions = OCMClassMock([GADAdLoaderOptions class]); OCMStub([mockNativeAdOptions asGADAdLoaderOptions]) - .andReturn(mockGADAdLoaderOptions); + .andReturn([NSArray arrayWithObject:mockGADAdLoaderOptions]); UIViewController *mockViewController = OCMClassMock([UIViewController class]); FLTNativeTemplateStyle *templateStyle = OCMClassMock([FLTNativeTemplateStyle class]); diff --git a/packages/google_mobile_ads/ios/google_mobile_ads.podspec b/packages/google_mobile_ads/ios/google_mobile_ads.podspec index a56b0857c..a7d5ce99b 100644 --- a/packages/google_mobile_ads/ios/google_mobile_ads.podspec +++ b/packages/google_mobile_ads/ios/google_mobile_ads.podspec @@ -15,9 +15,9 @@ Google Mobile Ads plugin for Flutter. s.source_files = 'Classes/**/*.{h,m}' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' - s.dependency 'Google-Mobile-Ads-SDK','~> 10.14.0' + s.dependency 'Google-Mobile-Ads-SDK','~> 11.1.0' s.dependency 'webview_flutter_wkwebview' - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '12.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS' => 'armv7 arm64 x86_64' } s.static_framework = true s.resource_bundles = { diff --git a/packages/google_mobile_ads/pubspec.yaml b/packages/google_mobile_ads/pubspec.yaml index 7e80db6ec..f87a3d310 100644 --- a/packages/google_mobile_ads/pubspec.yaml +++ b/packages/google_mobile_ads/pubspec.yaml @@ -28,12 +28,12 @@ flutter: pluginClass: FLTGoogleMobileAdsPlugin dependencies: - meta: ^1.0.4 + meta: ^1.10.0 flutter: sdk: flutter - webview_flutter_android: ^3.3.1 - webview_flutter_wkwebview: ^3.1.1 - webview_flutter: ^4.0.5 + webview_flutter_android: ^3.15.0 + webview_flutter_wkwebview: ^3.12.0 + webview_flutter: ^4.7.0 dev_dependencies: pedantic: ^1.11.0 @@ -44,7 +44,7 @@ dev_dependencies: build_runner: ^2.1.10 flutter_test: sdk: flutter - webview_flutter_platform_interface: ^2.1.0 + webview_flutter_platform_interface: ^2.10.0 environment: