Skip to content

Commit

Permalink
Merge pull request #945 from prebid/support-gma-10.14.0
Browse files Browse the repository at this point in the history
Support GMA SDK 10.14.0
  • Loading branch information
jsligh authored Jan 4, 2024
2 parents 6fa9e41 + f9b66a5 commit 5ac46d1
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class PrebidAdMobMediationBaseAdapter: NSObject, GADMediationAdapter {

// Added for tests
static func latestTestedGMAVersion() -> GADVersionNumber {
return GADVersionNumber(majorVersion: 10, minorVersion: 12, patchVersion: 0)
return GADVersionNumber(majorVersion: 10, minorVersion: 14, patchVersion: 0)
}

required public override init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class GAMUtils: NSObject {

// Added for tests
static func latestTestedGMAVersion() -> GADVersionNumber {
return GADVersionNumber(majorVersion: 10, minorVersion: 12, patchVersion: 0)
return GADVersionNumber(majorVersion: 10, minorVersion: 14, patchVersion: 0)
}

// MARK: Private Methods
Expand Down
6 changes: 3 additions & 3 deletions InternalTestApp/InternalTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-InternalTestApp-Skadn/Pods-InternalTestApp-Skadn-resources.sh",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-11.11.3/AppLovinSDKResources.bundle",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-12.1.0/AppLovinSDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
Expand All @@ -1320,7 +1320,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-InternalTestApp/Pods-InternalTestApp-resources.sh",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-11.11.3/AppLovinSDKResources.bundle",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-12.1.0/AppLovinSDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
Expand Down Expand Up @@ -1458,7 +1458,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-InternalTestAppTests/Pods-InternalTestAppTests-resources.sh",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-11.11.3/AppLovinSDKResources.bundle",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-12.1.0/AppLovinSDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
Expand Down
56 changes: 29 additions & 27 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,57 +1,59 @@
PODS:
- Alamofire (4.9.1)
- AppLovinSDK (11.11.3)
- AppLovinSDK (12.1.0)
- Eureka (5.4.0)
- Google-Mobile-Ads-SDK (10.12.0):
- Google-Mobile-Ads-SDK (10.14.0):
- GoogleAppMeasurement (< 11.0, >= 7.0)
- GoogleUserMessagingPlatform (>= 1.1)
- GoogleAds-IMA-iOS-SDK (3.19.2)
- GoogleAppMeasurement (10.16.0):
- GoogleAppMeasurement/AdIdSupport (= 10.16.0)
- GoogleAppMeasurement (10.19.0):
- GoogleAppMeasurement/AdIdSupport (= 10.19.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.16.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.16.0)
- GoogleAppMeasurement/AdIdSupport (10.19.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.19.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.16.0):
- GoogleAppMeasurement/WithoutAdIdSupport (10.19.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleUserMessagingPlatform (2.1.0)
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.11.5):
- GoogleUtilities/Environment (7.12.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.11.5):
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.11.5):
- GoogleUtilities/MethodSwizzler (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.11.5):
- GoogleUtilities/Network (7.12.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.11.5)"
- GoogleUtilities/Reachability (7.11.5):
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/Reachability (7.12.0):
- GoogleUtilities/Logger
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
- nanopb/encode (= 2.30909.0)
- nanopb/decode (2.30909.0)
- nanopb/encode (2.30909.0)
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
- nanopb/decode (2.30909.1)
- nanopb/encode (2.30909.1)
- PromisesObjC (2.3.1)
- RxSwift (6.6.0)
- SVProgressHUD (2.2.5)
- SVProgressHUD (2.3.1):
- SVProgressHUD/Core (= 2.3.1)
- SVProgressHUD/Core (2.3.1)

DEPENDENCIES:
- Alamofire (= 4.9.1)
Expand Down Expand Up @@ -79,18 +81,18 @@ SPEC REPOS:

SPEC CHECKSUMS:
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
AppLovinSDK: 623ef78363c0dd2c3ff5446cde37e4920a96b7e0
AppLovinSDK: 179d509c258e01a3a77eb8416f0ba843a12ed322
Eureka: fadaa9fa3d6e402d3c60f78f24edf3d7bafc9c29
Google-Mobile-Ads-SDK: 976fdf273815674eed30b8aafffedb3c25b055e4
Google-Mobile-Ads-SDK: 8f67a72f88d057335b1ac3f501e2b68ad054116e
GoogleAds-IMA-iOS-SDK: 0e817c05ab26f1b9285c80f4a75e1350a916d50b
GoogleAppMeasurement: 079d7632810e9d9704a99932547ba1554acc4342
GoogleAppMeasurement: 68afe759316673c6554dac35a0c7ae8f5d6cb4ed
GoogleUserMessagingPlatform: dce302b8f1b84d6e945812ee7a15c3f65a102cbf
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
RxSwift: a4b44f7d24599f674deebd1818eab82e58410632
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22

PODFILE CHECKSUM: bae4436ed691a1d2217fde386d8881d6e7e06963

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Foundation
class PrebidGAMVersionChecker {

var latestTestedGMAVersion: (Int, Int, Int) {
(10, 12, 0)
(10, 14, 0)
}

var currentGMAVersion: (Int, Int, Int)?
Expand Down
2 changes: 1 addition & 1 deletion tools/PrebidValidator/Dr.Prebid.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Dr.Prebid/Pods-Dr.Prebid-resources.sh",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-11.11.3/AppLovinSDKResources.bundle",
"${PODS_ROOT}/AppLovinSDK/applovin-ios-sdk-12.1.0/AppLovinSDKResources.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
Expand Down

0 comments on commit 5ac46d1

Please sign in to comment.