Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to work with GMA SDK iOS version 11.1.0 #1021

Merged
merged 7 commits into from
Mar 12, 2024
Merged

Upgrade to work with GMA SDK iOS version 11.1.0 #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
992cc9c
Removed call to iOS AppOpen deprecated methods
LTPhantom Mar 11, 2024
f5f8028
Format fix
LTPhantom Mar 11, 2024
462558b
Updated changes for compatibility with GMA SDK iOS 11.1.0
LTPhantom Mar 11, 2024
9f054d0
Format fix
LTPhantom Mar 11, 2024
e9f60ae
Format fix
LTPhantom Mar 11, 2024
ac577b5
Format fix
LTPhantom Mar 11, 2024
bfae853
Merge branch 'main' into iOSUpdate
LTPhantom Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/google_mobile_ads/example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
19 changes: 16 additions & 3 deletions packages/google_mobile_ads/example/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
194BB02CA5CDABA098EA0B10 /* Pods */ = {
isa = PBXGroup;
children = (
);
path = Pods;
sourceTree = "<group>";
};
5B6AAA352BAC85BF7DD68C46 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -222,6 +229,7 @@
9E61AA1729BBE51900801A83 /* RunnerTests */,
97C146EF1CF9000F007C117D /* Products */,
5B6AAA352BAC85BF7DD68C46 /* Frameworks */,
194BB02CA5CDABA098EA0B10 /* Pods */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -400,7 +408,8 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion packages/google_mobile_ads/example/ios/RunnerTests/FLTGoogleMobileAdsReaderWriterTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/google_mobile_ads/example/ios/RunnerTests/FLTNativeAdTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions packages/google_mobile_ads/ios/google_mobile_ads.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
10 changes: 5 additions & 5 deletions packages/google_mobile_ads/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down