Skip to content

Commit 11f002d

Browse files
OlenaPostindustriaOlenaPostindustria
committed
feat: update GMA SDK to 12.12.0
1 parent 1989612 commit 11f002d

8 files changed

Lines changed: 101 additions & 143 deletions

File tree

‎demo-ios-objc/Podfile.lock‎

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,8 @@
11
PODS:
2-
- Google-Mobile-Ads-SDK (8.13.0):
3-
- GoogleAppMeasurement (< 9.0, >= 7.0)
2+
- Google-Mobile-Ads-SDK (12.12.0):
43
- GoogleUserMessagingPlatform (>= 1.1)
5-
- GoogleAppMeasurement (8.10.0):
6-
- GoogleAppMeasurement/AdIdSupport (= 8.10.0)
7-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
8-
- GoogleUtilities/MethodSwizzler (~> 7.6)
9-
- GoogleUtilities/Network (~> 7.6)
10-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
11-
- nanopb (~> 2.30908.0)
12-
- GoogleAppMeasurement/AdIdSupport (8.10.0):
13-
- GoogleAppMeasurement/WithoutAdIdSupport (= 8.10.0)
14-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
15-
- GoogleUtilities/MethodSwizzler (~> 7.6)
16-
- GoogleUtilities/Network (~> 7.6)
17-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
18-
- nanopb (~> 2.30908.0)
19-
- GoogleAppMeasurement/WithoutAdIdSupport (8.10.0):
20-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
21-
- GoogleUtilities/MethodSwizzler (~> 7.6)
22-
- GoogleUtilities/Network (~> 7.6)
23-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
24-
- nanopb (~> 2.30908.0)
25-
- GoogleUserMessagingPlatform (2.0.0)
26-
- GoogleUtilities/AppDelegateSwizzler (7.6.0):
27-
- GoogleUtilities/Environment
28-
- GoogleUtilities/Logger
29-
- GoogleUtilities/Network
30-
- GoogleUtilities/Environment (7.6.0):
31-
- PromisesObjC (< 3.0, >= 1.2)
32-
- GoogleUtilities/Logger (7.6.0):
33-
- GoogleUtilities/Environment
34-
- GoogleUtilities/MethodSwizzler (7.6.0):
35-
- GoogleUtilities/Logger
36-
- GoogleUtilities/Network (7.6.0):
37-
- GoogleUtilities/Logger
38-
- "GoogleUtilities/NSData+zlib"
39-
- GoogleUtilities/Reachability
40-
- "GoogleUtilities/NSData+zlib (7.6.0)"
41-
- GoogleUtilities/Reachability (7.6.0):
42-
- GoogleUtilities/Logger
43-
- nanopb (2.30908.0):
44-
- nanopb/decode (= 2.30908.0)
45-
- nanopb/encode (= 2.30908.0)
46-
- nanopb/decode (2.30908.0)
47-
- nanopb/encode (2.30908.0)
4+
- GoogleUserMessagingPlatform (3.0.0)
485
- OptableSDK (0.10.0)
49-
- PromisesObjC (2.0.0)
506

517
DEPENDENCIES:
528
- Google-Mobile-Ads-SDK
@@ -55,24 +11,16 @@ DEPENDENCIES:
5511
SPEC REPOS:
5612
trunk:
5713
- Google-Mobile-Ads-SDK
58-
- GoogleAppMeasurement
5914
- GoogleUserMessagingPlatform
60-
- GoogleUtilities
61-
- nanopb
62-
- PromisesObjC
6315

6416
EXTERNAL SOURCES:
6517
OptableSDK:
6618
:path: "../"
6719

6820
SPEC CHECKSUMS:
69-
Google-Mobile-Ads-SDK: 05e5d68bb42a61b2e5bef336a52789785605aa22
70-
GoogleAppMeasurement: a3311dbcf3ea651e5a070fe8559b57c174ada081
71-
GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
72-
GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237
73-
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
21+
Google-Mobile-Ads-SDK: 4dde70a8c18d96b14f9548759b8cec6ecb0bc3e6
22+
GoogleUserMessagingPlatform: f8d0cdad3ca835406755d0a69aa634f00e76d576
7423
OptableSDK: fc5d3852c29fac1881b1d3ab6ea397de71c8cbf1
75-
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
7624

7725
PODFILE CHECKSUM: 48d927338b39550c29272b694f6c18710f33f913
7826

‎demo-ios-objc/demo-ios-objc.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
6320EEF62535F92300F76877 /* Frameworks */,
202202
6320EEF72535F92300F76877 /* Resources */,
203203
488A3D0FB1FEC17C93145EF4 /* [CP] Embed Pods Frameworks */,
204+
A3A695A26763A7F969BB5E1A /* [CP] Copy Pods Resources */,
204205
);
205206
buildRules = (
206207
);
@@ -239,6 +240,7 @@
239240
6320EF1C2535F92600F76877 /* Frameworks */,
240241
6320EF1D2535F92600F76877 /* Resources */,
241242
AB4697C1A666D79358A1D434 /* [CP] Embed Pods Frameworks */,
243+
BBD55B57C4C9D1BE96E25EA6 /* [CP] Copy Pods Resources */,
242244
);
243245
buildRules = (
244246
);
@@ -350,14 +352,10 @@
350352
inputFileListPaths = (
351353
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-frameworks-${CONFIGURATION}-input-files.xcfilelist",
352354
);
353-
inputPaths = (
354-
);
355355
name = "[CP] Embed Pods Frameworks";
356356
outputFileListPaths = (
357357
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-frameworks-${CONFIGURATION}-output-files.xcfilelist",
358358
);
359-
outputPaths = (
360-
);
361359
runOnlyForDeploymentPostprocessing = 0;
362360
shellPath = /bin/sh;
363361
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-frameworks.sh\"\n";
@@ -407,6 +405,23 @@
407405
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
408406
showEnvVarsInLog = 0;
409407
};
408+
A3A695A26763A7F969BB5E1A /* [CP] Copy Pods Resources */ = {
409+
isa = PBXShellScriptBuildPhase;
410+
buildActionMask = 2147483647;
411+
files = (
412+
);
413+
inputFileListPaths = (
414+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-resources-${CONFIGURATION}-input-files.xcfilelist",
415+
);
416+
name = "[CP] Copy Pods Resources";
417+
outputFileListPaths = (
418+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-resources-${CONFIGURATION}-output-files.xcfilelist",
419+
);
420+
runOnlyForDeploymentPostprocessing = 0;
421+
shellPath = /bin/sh;
422+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc/Pods-demo-ios-objc-resources.sh\"\n";
423+
showEnvVarsInLog = 0;
424+
};
410425
AB4697C1A666D79358A1D434 /* [CP] Embed Pods Frameworks */ = {
411426
isa = PBXShellScriptBuildPhase;
412427
buildActionMask = 2147483647;
@@ -415,19 +430,32 @@
415430
inputFileListPaths = (
416431
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
417432
);
418-
inputPaths = (
419-
);
420433
name = "[CP] Embed Pods Frameworks";
421434
outputFileListPaths = (
422435
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
423436
);
424-
outputPaths = (
425-
);
426437
runOnlyForDeploymentPostprocessing = 0;
427438
shellPath = /bin/sh;
428439
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-frameworks.sh\"\n";
429440
showEnvVarsInLog = 0;
430441
};
442+
BBD55B57C4C9D1BE96E25EA6 /* [CP] Copy Pods Resources */ = {
443+
isa = PBXShellScriptBuildPhase;
444+
buildActionMask = 2147483647;
445+
files = (
446+
);
447+
inputFileListPaths = (
448+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-resources-${CONFIGURATION}-input-files.xcfilelist",
449+
);
450+
name = "[CP] Copy Pods Resources";
451+
outputFileListPaths = (
452+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-resources-${CONFIGURATION}-output-files.xcfilelist",
453+
);
454+
runOnlyForDeploymentPostprocessing = 0;
455+
shellPath = /bin/sh;
456+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-objc-demo-ios-objcUITests/Pods-demo-ios-objc-demo-ios-objcUITests-resources.sh\"\n";
457+
showEnvVarsInLog = 0;
458+
};
431459
/* End PBXShellScriptBuildPhase section */
432460

433461
/* Begin PBXSourcesBuildPhase section */

‎demo-ios-objc/demo-ios-objc/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,7 @@
6969
<array>
7070
<string>UIInterfaceOrientationPortrait</string>
7171
</array>
72+
<key>GADApplicationIdentifier</key>
73+
<string>ca-app-pub-6766188723152719~7079124913</string>
7274
</dict>
7375
</plist>

‎demo-ios-swift/Podfile.lock‎

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,8 @@
11
PODS:
2-
- Google-Mobile-Ads-SDK (8.13.0):
3-
- GoogleAppMeasurement (< 9.0, >= 7.0)
2+
- Google-Mobile-Ads-SDK (12.11.0):
43
- GoogleUserMessagingPlatform (>= 1.1)
5-
- GoogleAppMeasurement (8.10.0):
6-
- GoogleAppMeasurement/AdIdSupport (= 8.10.0)
7-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
8-
- GoogleUtilities/MethodSwizzler (~> 7.6)
9-
- GoogleUtilities/Network (~> 7.6)
10-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
11-
- nanopb (~> 2.30908.0)
12-
- GoogleAppMeasurement/AdIdSupport (8.10.0):
13-
- GoogleAppMeasurement/WithoutAdIdSupport (= 8.10.0)
14-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
15-
- GoogleUtilities/MethodSwizzler (~> 7.6)
16-
- GoogleUtilities/Network (~> 7.6)
17-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
18-
- nanopb (~> 2.30908.0)
19-
- GoogleAppMeasurement/WithoutAdIdSupport (8.10.0):
20-
- GoogleUtilities/AppDelegateSwizzler (~> 7.6)
21-
- GoogleUtilities/MethodSwizzler (~> 7.6)
22-
- GoogleUtilities/Network (~> 7.6)
23-
- "GoogleUtilities/NSData+zlib (~> 7.6)"
24-
- nanopb (~> 2.30908.0)
25-
- GoogleUserMessagingPlatform (2.0.0)
26-
- GoogleUtilities/AppDelegateSwizzler (7.6.0):
27-
- GoogleUtilities/Environment
28-
- GoogleUtilities/Logger
29-
- GoogleUtilities/Network
30-
- GoogleUtilities/Environment (7.6.0):
31-
- PromisesObjC (< 3.0, >= 1.2)
32-
- GoogleUtilities/Logger (7.6.0):
33-
- GoogleUtilities/Environment
34-
- GoogleUtilities/MethodSwizzler (7.6.0):
35-
- GoogleUtilities/Logger
36-
- GoogleUtilities/Network (7.6.0):
37-
- GoogleUtilities/Logger
38-
- "GoogleUtilities/NSData+zlib"
39-
- GoogleUtilities/Reachability
40-
- "GoogleUtilities/NSData+zlib (7.6.0)"
41-
- GoogleUtilities/Reachability (7.6.0):
42-
- GoogleUtilities/Logger
43-
- nanopb (2.30908.0):
44-
- nanopb/decode (= 2.30908.0)
45-
- nanopb/encode (= 2.30908.0)
46-
- nanopb/decode (2.30908.0)
47-
- nanopb/encode (2.30908.0)
4+
- GoogleUserMessagingPlatform (3.0.0)
485
- OptableSDK (0.10.0)
49-
- PromisesObjC (2.0.0)
506

517
DEPENDENCIES:
528
- Google-Mobile-Ads-SDK
@@ -55,24 +11,16 @@ DEPENDENCIES:
5511
SPEC REPOS:
5612
trunk:
5713
- Google-Mobile-Ads-SDK
58-
- GoogleAppMeasurement
5914
- GoogleUserMessagingPlatform
60-
- GoogleUtilities
61-
- nanopb
62-
- PromisesObjC
6315

6416
EXTERNAL SOURCES:
6517
OptableSDK:
6618
:path: "../"
6719

6820
SPEC CHECKSUMS:
69-
Google-Mobile-Ads-SDK: 05e5d68bb42a61b2e5bef336a52789785605aa22
70-
GoogleAppMeasurement: a3311dbcf3ea651e5a070fe8559b57c174ada081
71-
GoogleUserMessagingPlatform: ab890ce5f6620f293a21b6bdd82e416a2c73aeca
72-
GoogleUtilities: 684ee790a24f73ebb2d1d966e9711c203f2a4237
73-
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
21+
Google-Mobile-Ads-SDK: b833c723759e32bbaf06edaaf2293f08ed898232
22+
GoogleUserMessagingPlatform: f8d0cdad3ca835406755d0a69aa634f00e76d576
7423
OptableSDK: fc5d3852c29fac1881b1d3ab6ea397de71c8cbf1
75-
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
7624

7725
PODFILE CHECKSUM: a7bf67fad0ec61ca3a95f0f8a9aadf2c4fd2cd76
7826

‎demo-ios-swift/demo-ios-swift.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
6352AA5524DC7AE9002E66EB /* Resources */,
198198
63C1E32924EAD80B00C4FE51 /* Embed Frameworks */,
199199
CB6C39DB30FCBD8A10020CE8 /* [CP] Embed Pods Frameworks */,
200+
E4BF60F1588582695FC58696 /* [CP] Copy Pods Resources */,
200201
);
201202
buildRules = (
202203
);
@@ -235,6 +236,7 @@
235236
6352AA7524DC7AEC002E66EB /* Frameworks */,
236237
6352AA7624DC7AEC002E66EB /* Resources */,
237238
A4AD3035FC184EEC8114DE25 /* [CP] Embed Pods Frameworks */,
239+
D947CAD4B818D4D20E781F9D /* [CP] Copy Pods Resources */,
238240
);
239241
buildRules = (
240242
);
@@ -391,14 +393,10 @@
391393
inputFileListPaths = (
392394
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
393395
);
394-
inputPaths = (
395-
);
396396
name = "[CP] Embed Pods Frameworks";
397397
outputFileListPaths = (
398398
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
399399
);
400-
outputPaths = (
401-
);
402400
runOnlyForDeploymentPostprocessing = 0;
403401
shellPath = /bin/sh;
404402
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-frameworks.sh\"\n";
@@ -412,19 +410,49 @@
412410
inputFileListPaths = (
413411
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-frameworks-${CONFIGURATION}-input-files.xcfilelist",
414412
);
415-
inputPaths = (
416-
);
417413
name = "[CP] Embed Pods Frameworks";
418414
outputFileListPaths = (
419415
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-frameworks-${CONFIGURATION}-output-files.xcfilelist",
420416
);
421-
outputPaths = (
422-
);
423417
runOnlyForDeploymentPostprocessing = 0;
424418
shellPath = /bin/sh;
425419
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-frameworks.sh\"\n";
426420
showEnvVarsInLog = 0;
427421
};
422+
D947CAD4B818D4D20E781F9D /* [CP] Copy Pods Resources */ = {
423+
isa = PBXShellScriptBuildPhase;
424+
buildActionMask = 2147483647;
425+
files = (
426+
);
427+
inputFileListPaths = (
428+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-resources-${CONFIGURATION}-input-files.xcfilelist",
429+
);
430+
name = "[CP] Copy Pods Resources";
431+
outputFileListPaths = (
432+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-resources-${CONFIGURATION}-output-files.xcfilelist",
433+
);
434+
runOnlyForDeploymentPostprocessing = 0;
435+
shellPath = /bin/sh;
436+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift-demo-ios-swiftUITests/Pods-demo-ios-swift-demo-ios-swiftUITests-resources.sh\"\n";
437+
showEnvVarsInLog = 0;
438+
};
439+
E4BF60F1588582695FC58696 /* [CP] Copy Pods Resources */ = {
440+
isa = PBXShellScriptBuildPhase;
441+
buildActionMask = 2147483647;
442+
files = (
443+
);
444+
inputFileListPaths = (
445+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-resources-${CONFIGURATION}-input-files.xcfilelist",
446+
);
447+
name = "[CP] Copy Pods Resources";
448+
outputFileListPaths = (
449+
"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-resources-${CONFIGURATION}-output-files.xcfilelist",
450+
);
451+
runOnlyForDeploymentPostprocessing = 0;
452+
shellPath = /bin/sh;
453+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo-ios-swift/Pods-demo-ios-swift-resources.sh\"\n";
454+
showEnvVarsInLog = 0;
455+
};
428456
/* End PBXShellScriptBuildPhase section */
429457

430458
/* Begin PBXSourcesBuildPhase section */

‎demo-ios-swift/demo-ios-swift/AppDelegate.swift‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3030

3131
// MARK: UISceneSession Lifecycle
3232

33-
func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
34-
// Called when a new scene session is being created.
35-
// Use this method to select a configuration to create the new scene with.
36-
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
37-
}
38-
39-
func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
40-
// Called when the user discards a scene session.
41-
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
42-
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
33+
func application(
34+
_ application: UIApplication,
35+
configurationForConnecting connectingSceneSession: UISceneSession,
36+
options: UIScene.ConnectionOptions
37+
) -> UISceneConfiguration {
38+
return UISceneConfiguration(
39+
name: "Default Configuration",
40+
sessionRole: connectingSceneSession.role
41+
)
4342
}
4443

44+
func application(
45+
_ application: UIApplication,
46+
didDiscardSceneSessions sceneSessions: Set<UISceneSession>
47+
) {}
4548
}
46-

0 commit comments

Comments
 (0)