diff --git a/CHANGELOG.md b/CHANGELOG.md index 501c17a..5a9a131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ Note the first digit of every adapter version corresponds to the major version of the Chartboost Mediation SDK compatible with that adapter. Adapters are compatible with any Chartboost Mediation SDK version within that major version. +### 5.11.10.0.1 +- Updated to use v2 of the SCAR API +- This version of the adapter has been certified with Google-Mobile-Ads-SDK 11.10.0. + ### 5.11.10.0.0 - This version of the adapter has been certified with Google-Mobile-Ads-SDK 11.10.0. diff --git a/ChartboostMediationAdapterGoogleBidding.podspec b/ChartboostMediationAdapterGoogleBidding.podspec index 0be83cc..9594af2 100644 --- a/ChartboostMediationAdapterGoogleBidding.podspec +++ b/ChartboostMediationAdapterGoogleBidding.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'ChartboostMediationAdapterGoogleBidding' - spec.version = '5.11.10.0.0' + spec.version = '5.11.10.0.1' spec.license = { :type => 'MIT', :file => 'LICENSE.md' } spec.homepage = 'https://github.com/ChartBoost/chartboost-mediation-ios-adapter-google-bidding' spec.authors = { 'Chartboost' => 'https://www.chartboost.com/' } diff --git a/Source/GoogleBiddingAdapter.swift b/Source/GoogleBiddingAdapter.swift index 4b6a69c..55b1430 100644 --- a/Source/GoogleBiddingAdapter.swift +++ b/Source/GoogleBiddingAdapter.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. @@ -84,10 +84,6 @@ final class GoogleBiddingAdapter: PartnerAdapter { func fetchBidderInformation(request: PartnerAdPreBidRequest, completion: @escaping (Result<[String: String], Error>) -> Void) { log(.fetchBidderInfoStarted(request)) - let gbRequest = GADRequest() - gbRequest.requestAgent = "Chartboost" - gbRequest.register(sharedExtras) - // Convert from our internal AdFormat type to Google's ad format type guard let gbAdFormat = googleAdFormat(from: request.format) else { let error = error(.prebidFailureUnsupportedAdFormat, description: "Failed to map ad format \(request.format) to GADAdFormat") @@ -96,13 +92,32 @@ final class GoogleBiddingAdapter: PartnerAdapter { return } - GADQueryInfo.createQueryInfo(with: gbRequest, adFormat: gbAdFormat) { queryInfo, error in + let gbRequest: GADSignalRequest + switch gbAdFormat { + case .banner: + gbRequest = GADBannerSignalRequest(signalType: GoogleStrings.queryType) + case .interstitial: + gbRequest = GADInterstitialSignalRequest(signalType: GoogleStrings.queryType) + case .rewarded: + gbRequest = GADRewardedSignalRequest(signalType: GoogleStrings.queryType) + case .rewardedInterstitial: + gbRequest = GADRewardedInterstitialSignalRequest(signalType: GoogleStrings.queryType) + default: + let error = error(.prebidFailureUnknown, description: "Unsupported google ad format \(gbAdFormat)") + log(.fetchBidderInfoFailed(request, error: error)) + completion(.failure(error)) + return + } + gbRequest.requestAgent = "Chartboost" + gbRequest.register(sharedExtras) + + GADMobileAds.generateSignal(gbRequest) { signal, error in if let error { self.log(.fetchBidderInfoFailed(request, error: error)) completion(.failure(error)) } else { self.log(.fetchBidderInfoSucceeded(request)) - let token = queryInfo?.query + let token = signal?.signalString completion(.success(token.map { ["token": $0] } ?? [:])) } } diff --git a/Source/GoogleBiddingAdapterAd.swift b/Source/GoogleBiddingAdapterAd.swift index 49b165e..6322326 100644 --- a/Source/GoogleBiddingAdapterAd.swift +++ b/Source/GoogleBiddingAdapterAd.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. diff --git a/Source/GoogleBiddingAdapterBannerAd.swift b/Source/GoogleBiddingAdapterBannerAd.swift index 4f4552a..15c0b8e 100644 --- a/Source/GoogleBiddingAdapterBannerAd.swift +++ b/Source/GoogleBiddingAdapterBannerAd.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. diff --git a/Source/GoogleBiddingAdapterConfiguration.swift b/Source/GoogleBiddingAdapterConfiguration.swift index 870332e..b7df95e 100644 --- a/Source/GoogleBiddingAdapterConfiguration.swift +++ b/Source/GoogleBiddingAdapterConfiguration.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. @@ -20,7 +20,7 @@ import GoogleMobileAds /// last digit is the adapter's build version, and intermediate digits are the partner SDK's version. /// Format: `.... /// .` where `.` is optional. - @objc public static let adapterVersion = "5.11.10.0.0" + @objc public static let adapterVersion = "5.11.10.0.1" /// The partner's unique identifier. @objc public static let partnerID = "google_googlebidding" diff --git a/Source/GoogleBiddingAdapterInterstitialAd.swift b/Source/GoogleBiddingAdapterInterstitialAd.swift index 4060f33..21c6b37 100644 --- a/Source/GoogleBiddingAdapterInterstitialAd.swift +++ b/Source/GoogleBiddingAdapterInterstitialAd.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. diff --git a/Source/GoogleBiddingAdapterRewardedAd.swift b/Source/GoogleBiddingAdapterRewardedAd.swift index 36a7773..6ed9443 100644 --- a/Source/GoogleBiddingAdapterRewardedAd.swift +++ b/Source/GoogleBiddingAdapterRewardedAd.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. diff --git a/Source/GoogleBiddingAdapterRewardedInterstitialAd.swift b/Source/GoogleBiddingAdapterRewardedInterstitialAd.swift index 83550b5..db0565a 100644 --- a/Source/GoogleBiddingAdapterRewardedInterstitialAd.swift +++ b/Source/GoogleBiddingAdapterRewardedInterstitialAd.swift @@ -1,4 +1,4 @@ -// Copyright 2022-2024 Chartboost, Inc. +// Copyright 2022-2025 Chartboost, Inc. // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file.