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.

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

Update Google Mobile Ads SDK 11.3.0 #357

Merged
merged 2 commits into from
May 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apidoc/Admob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ description: |
If you use Facebook Audience Network mediation, starting with iOS 14, you will need to implement the setAdvertiserTrackingEnabled flag.
This allows you to inform Facebook whether to use the data to deliver personalized ads. If the flag is set to false, Facebook will not be able to deliver personalized ads.
You need to set this flag before initializing the mediation SDK in order to receive it in the bidding request.
The setter for advertiserTrackingEnabled flag is deprecated from iOS ti.admob version 7.1.0: The setAdvertiserTrackingEnabled flag is not used for Audience Network SDK 6.15.0+ on iOS 17+ as the Audience Network SDK 6.15.0+ on iOS 17+ now relies on [ATTrackingManager trackingAuthorizationStatus] to accurately represent ATT permission for users of your app.

If you use InMobi mediation, instead, you will have to use the method setInMobi_updateGDPRConsent to deliver personalized ads.

Expand Down Expand Up @@ -525,6 +526,9 @@ methods:
be able to deliver personalized ads.
platforms: [iphone, ipad]
since: "3.1.0"
deprecated:
since: "7.1.0"
notes: "The setter for advertiserTrackingEnabled flag is deprecated: The setAdvertiserTrackingEnabled flag is not used for Audience Network SDK 6.15.0+ on iOS 17+ as the Audience Network SDK 6.15.0+ on iOS 17+ now relies on [ATTrackingManager trackingAuthorizationStatus] to accurately represent ATT permission for users of your app."
osver: {ios: {min: "14.0"}}
parameters:
- name: tag
Expand Down
73 changes: 38 additions & 35 deletions ios/Classes/TiAdmobModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -54,42 +54,43 @@ - (NSString *)moduleId
- (void)deleteTCStringIfOutdated {
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];

// IABTCF string is stored in userDefaults
NSString *tcString = [userDefaults stringForKey:@"IABTCF_TCString"] ?: @"";

// Check if the TCF string is empty
if (tcString.length > 0) {
// Retrieve the IABTCF string from userDefaults
NSString *tcString = [userDefaults stringForKey:@"IABTCF_TCString"];

// base64 alphabet used to store data in IABTCF string
NSString *base64 = @"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

// Date is stored in digits 1..7 of the IABTCF string
NSString *dateSubstring = [tcString substringWithRange:NSMakeRange(1, 6)];

// Interpret date substring as base64-encoded integer value
long timestamp = 0;
for (int i = 0; i < dateSubstring.length; i++) {
unichar c = [dateSubstring characterAtIndex:i];

NSInteger value = [base64 rangeOfString:[NSString stringWithFormat:@"%C", c]].location;
timestamp = timestamp * 64 + value;
}

// Timestamp is given is deci-seconds, convert to milliseconds
timestamp *= 100;

// Compare with current timestamp to get age in days
long daysAgo = (long)(([[NSDate date] timeIntervalSince1970] * 1000) - timestamp) / (1000 * 60 * 60 * 24);
NSLog(@"[DEBUG] Ti.AdMob: TC string last updated date was %ld days ago", daysAgo);
// Delete TC string if age is over a year
if (daysAgo > 365) {
[userDefaults removeObjectForKey:@"IABTCF_TCString"];
[userDefaults synchronize];
NSLog(@"[DEBUG] Ti.AdMob: TC string removed");
}
} else {
NSLog(@"[DEBUG] The TCF string does not exist or is empty.");
}
// Return early if the TC string does not exist
if (!tcString) {
NSLog(@"[DEBUG] The IABTCF_TCString does not exist.");
return;
}

// Base64 alphabet used to store data in IABTCF string
NSString *base64 = @"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";

// Date is stored in digits 1..7 of the IABTCF string
NSString *dateSubstring = [tcString substringWithRange:NSMakeRange(1, 6)];

// Interpret date substring as base64-encoded integer value
long long timestamp = 0;
for (int i = 0; i < dateSubstring.length; i++) {
unichar c = [dateSubstring characterAtIndex:i];
NSUInteger value = [base64 rangeOfString:[NSString stringWithFormat:@"%C", c]].location;
timestamp = timestamp * 64 + value;
}

// Timestamp is given in deci-seconds, convert to milliseconds
timestamp *= 100;

// Calculate age in days by comparing with the current timestamp
long daysAgo = (long)(([[NSDate date] timeIntervalSince1970] * 1000 - timestamp) / (1000 * 60 * 60 * 24));

// Delete TC string if it is over a year old
if (daysAgo > 365) {
[userDefaults removeObjectForKey:@"IABTCF_TCString"];
[userDefaults synchronize];
NSLog(@"[DEBUG] Ti.AdMob: TC string removed as it was %ld days old.", daysAgo);
} else {
NSLog(@"[DEBUG] Ti.AdMob: TC string is not outdated. Last updated %ld days ago.", daysAgo);
}
}

- (void)disableSDKCrashReporting:(id)unused
Expand Down Expand Up @@ -430,6 +431,8 @@ - (void)requestTrackingAuthorization:(id)args

- (void)setAdvertiserTrackingEnabled:(id)advertiserTrackingEnabled
{
DEPRECATED_REMOVED(@"advertiserTrackingEnabled", @"7.1.0", @"8.0.0 The setAdvertiserTrackingEnabled flag is not used for Audience Network SDK 6.15.0+ on iOS 17+ as the Audience Network SDK 6.15.0+ on iOS 17+ now relies on [ATTrackingManager trackingAuthorizationStatus] to accurately represent ATT permission for users of your app);");

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use the DEPRECATED_REPLACED() macro to return a standardized log message :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in abd1591

// this method is required by Facebook Audience Network for iOS >= 14
if (@available(iOS 14, *)) {
ENSURE_TYPE(advertiserTrackingEnabled, NSNumber);
Expand Down
Binary file added ios/Resources/InMobiSDK_Privacy.bundle/Info.plist
Binary file not shown.
27 changes: 27 additions & 0 deletions ios/Resources/InMobiSDK_Privacy.bundle/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>E174.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
</dict>
</array>
</dict>
</plist>
Binary file not shown.
Binary file not shown.
Binary file not shown.
113 changes: 113 additions & 0 deletions ios/Resources/InMobiSDK_Privacy.bundle/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>PrivacyInfo.xcprivacy</key>
<data>
BLNjR6VVI/K82v3iQCE5o0YXgGI=
</data>
</dict>
<key>files2</key>
<dict>
<key>PrivacyInfo.xcprivacy</key>
<dict>
<key>hash</key>
<data>
BLNjR6VVI/K82v3iQCE5o0YXgGI=
</data>
<key>hash2</key>
<data>
ES/wHPURrhqoWqlouH6JyVI5Y7FKY1pgaWMpkbPGo0E=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
Binary file not shown.
23 changes: 19 additions & 4 deletions ios/admob.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 54;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -18,6 +18,7 @@
3AF5B7731C233383002E3DC7 /* TiAdmobTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AF5B7711C233383002E3DC7 /* TiAdmobTypes.h */; };
5E0B17A527F21AED001D0BD9 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E0B17A427F21AED001D0BD9 /* File.swift */; };
5E343CDF291BFA3600F047EB /* MetaAdapter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E343CDE291BFA3600F047EB /* MetaAdapter.xcframework */; };
5E54F76B2BCEDF40001F794D /* InMobiSDK_Privacy.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 5E54F76A2BCEDF40001F794D /* InMobiSDK_Privacy.bundle */; };
5E58AD4E2ADAE76000C78E7F /* StatusBarHiddenViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E58AD4C2ADAE76000C78E7F /* StatusBarHiddenViewController.h */; };
5E58AD4F2ADAE76000C78E7F /* StatusBarHiddenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E58AD4D2ADAE76000C78E7F /* StatusBarHiddenViewController.m */; };
5E6743A427F4B84500BEE594 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E6743A327F4B84500BEE594 /* WebKit.framework */; };
Expand All @@ -37,18 +38,19 @@
24DD6CF71134B3F500162E58 /* TiAdmobModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiAdmobModule.h; path = Classes/TiAdmobModule.h; sourceTree = "<group>"; };
24DD6CF81134B3F500162E58 /* TiAdmobModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TiAdmobModule.m; path = Classes/TiAdmobModule.m; sourceTree = "<group>"; };
24DD6D1B1134B66800162E58 /* titanium.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = titanium.xcconfig; sourceTree = "<group>"; };
3ABFE38126335E0000887180 /* GoogleMobileAds.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMobileAds.xcframework; path = platform/GoogleMobileAds.xcframework; sourceTree = "<group>"; };
3ABFE38926335E0000887180 /* UserMessagingPlatform.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = UserMessagingPlatform.xcframework; path = platform/UserMessagingPlatform.xcframework; sourceTree = "<group>"; };
3ABFE38126335E0000887180 /* GoogleMobileAds.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:CSTR6SUWN9:AdMob, Inc."; lastKnownFileType = wrapper.xcframework; name = GoogleMobileAds.xcframework; path = platform/GoogleMobileAds.xcframework; sourceTree = "<group>"; };
3ABFE38926335E0000887180 /* UserMessagingPlatform.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:CSTR6SUWN9:AdMob, Inc."; lastKnownFileType = wrapper.xcframework; name = UserMessagingPlatform.xcframework; path = platform/UserMessagingPlatform.xcframework; sourceTree = "<group>"; };
3AF5B7711C233383002E3DC7 /* TiAdmobTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TiAdmobTypes.h; path = Classes/TiAdmobTypes.h; sourceTree = "<group>"; };
5E0B17A327F21AED001D0BD9 /* admob-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "admob-Bridging-Header.h"; sourceTree = "<group>"; };
5E0B17A427F21AED001D0BD9 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
5E343CDE291BFA3600F047EB /* MetaAdapter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MetaAdapter.xcframework; path = platform/MetaAdapter.xcframework; sourceTree = "<group>"; };
5E54F76A2BCEDF40001F794D /* InMobiSDK_Privacy.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = InMobiSDK_Privacy.bundle; path = Resources/InMobiSDK_Privacy.bundle; sourceTree = "<group>"; };
5E58AD4C2ADAE76000C78E7F /* StatusBarHiddenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatusBarHiddenViewController.h; path = Classes/StatusBarHiddenViewController.h; sourceTree = "<group>"; };
5E58AD4D2ADAE76000C78E7F /* StatusBarHiddenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatusBarHiddenViewController.m; path = Classes/StatusBarHiddenViewController.m; sourceTree = "<group>"; };
5E6743A327F4B84500BEE594 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk/System/iOSSupport/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; };
5E6743A527F4B85800BEE594 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk/usr/lib/libsqlite3.0.tbd; sourceTree = DEVELOPER_DIR; };
5E6743A727F4B86A00BEE594 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.1.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
5ED7B65F26EBC395007F4D90 /* FBAudienceNetwork.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FBAudienceNetwork.xcframework; path = platform/FBAudienceNetwork.xcframework; sourceTree = "<group>"; };
5ED7B65F26EBC395007F4D90 /* FBAudienceNetwork.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:V9WTTPBFK9:Meta Platforms, Inc."; lastKnownFileType = wrapper.xcframework; name = FBAudienceNetwork.xcframework; path = platform/FBAudienceNetwork.xcframework; sourceTree = "<group>"; };
5EFC8F4C263ABC430011A0C2 /* InMobiSDK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = InMobiSDK.xcframework; path = platform/InMobiSDK.xcframework; sourceTree = "<group>"; };
5EFC8F4D263ABC430011A0C2 /* InMobiAdapter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = InMobiAdapter.xcframework; path = platform/InMobiAdapter.xcframework; sourceTree = "<group>"; };
AA747D9E0F9514B9006C5449 /* TiAdmob_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TiAdmob_Prefix.pch; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -86,6 +88,7 @@
0867D691FE84028FC02AAC07 /* admob */ = {
isa = PBXGroup;
children = (
5E54F76A2BCEDF40001F794D /* InMobiSDK_Privacy.bundle */,
5E0B17A427F21AED001D0BD9 /* File.swift */,
08FB77AEFE84172EC02AAC07 /* Classes */,
32C88DFF0371C24200C91783 /* Other Sources */,
Expand Down Expand Up @@ -163,6 +166,7 @@
D2AAC07A0554694100DB518D /* Headers */,
D2AAC07B0554694100DB518D /* Sources */,
D2AAC07C0554694100DB518D /* Frameworks */,
5E54F7692BCEDE00001F794D /* Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -204,6 +208,17 @@
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
5E54F7692BCEDE00001F794D /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5E54F76B2BCEDF40001F794D /* InMobiSDK_Privacy.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
D2AAC07B0554694100DB518D /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down
9 changes: 9 additions & 0 deletions ios/documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

### v7.1.0
- Update Google Mobile Ads SDK 11.3.0 (https://github.com/CocoaPods/Specs/tree/master/Specs/5/9/a/Google-Mobile-Ads-SDK/11.3.0)
- Update Meta Audience Network SDK 6.15.0 (https://developers.facebook.com/docs/audience-network/setting-up/platform-setup/ios/changelog#6_15_0)
- Update Meta Adapter 6.15.0.0 (https://developers.google.com/admob/ios/mediation/meta#version-6.15.0.0)
- Update InMobi SDK 10.7.1 (https://support.inmobi.com/monetize/sdk-documentation/download-sdk)
- Update InMobiAdapter 10.7.1.0 (https://developers.google.com/admob/ios/mediation/inmobi#version-10.7.1.0)
- Deprecated iOS `setAdvertiserTrackingEnabled` for Audience Network
- Updated documentation

### v7.0.0
- Migration to SDK v11 (https://developers.google.com/admob/ios/migration#migrate-to-sdk-v11)
- Update Google Mobile Ads SDK 11.0.1 (https://github.com/CocoaPods/Specs/tree/master/Specs/5/9/a/Google-Mobile-Ads-SDK/11.0.1)
Expand Down
4 changes: 3 additions & 1 deletion ios/documentation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,12 @@ Resets consent information to default state and clears ad providers.

### `setAdvertiserTrackingEnabled(true|false)`

If you use Facebook Audience Network mediation, starting with iOS 14, you will need to implement the setAdvertiserTrackingEnabled flag.
If you use Facebook Audience Network mediation, starting with iOS 14, you will need to implement the `setAdvertiserTrackingEnabled` flag.
This allows you to inform Facebook whether to use the data to deliver personalized ads. If the flag is set to false, Facebook will not be able to deliver personalized ads.
You need to set this flag before initializing the mediation SDK in order to receive it in the bidding request.

The setter for advertiserTrackingEnabled flag is deprecated since Ti.Admob 7.1.0: The `setAdvertiserTrackingEnabled` flag is not used for Audience Network SDK 6.15.0+ on iOS 17+ as the Audience Network SDK 6.15.0+ on iOS 17+ now relies on `[ATTrackingManager trackingAuthorizationStatus]` to accurately represent ATT permission for users of your app.

### `setInMobi_updateGDPRConsent(true|false)`

If you use InMobi mediation, this allows you to inform InMobi whether to use the data to deliver personalized ads. If the flag is set to false, InMobi will not be able to deliver personalized ads.
Expand Down
2 changes: 1 addition & 1 deletion ios/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 7.0.0
version: 7.1.1
architectures: arm64 x86_64
mac: false
description: AdMob module for ad delivery via AdMob
Expand Down
Loading
Loading