diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/UID2GMAPlugin.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/UID2GMAPlugin.xcscheme
index cdd1302..0dcd314 100644
--- a/.swiftpm/xcode/xcshareddata/xcschemes/UID2GMAPlugin.xcscheme
+++ b/.swiftpm/xcode/xcshareddata/xcschemes/UID2GMAPlugin.xcscheme
@@ -28,6 +28,18 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
+
+
+
+
+
+
GADVersionNumber {
- var version = GADVersionNumber()
- version.majorVersion = 1
+ static func adapterVersion() -> VersionNumber {
+ var version = VersionNumber()
+ version.majorVersion = 2
version.minorVersion = 0
- version.patchVersion = 1
+ version.patchVersion = 0
return version
}
- static func adSDKVersion() -> GADVersionNumber {
+ static func adSDKVersion() -> VersionNumber {
let uid2Version = UID2SDKProperties.getUID2SDKVersion()
- var version = GADVersionNumber()
+ var version = VersionNumber()
version.majorVersion = uid2Version.major
version.minorVersion = uid2Version.minor
version.patchVersion = uid2Version.patch
return version
}
- static func networkExtrasClass() -> GADAdNetworkExtras.Type? {
+ static func networkExtrasClass() -> AdNetworkExtras.Type? {
return nil
}
diff --git a/Sources/UID2GMAPlugin/UID2GMAMediationAdapter.swift b/Sources/UID2GMAPlugin/UID2GMAMediationAdapter.swift
index 3ac9c0a..1a56c7e 100644
--- a/Sources/UID2GMAPlugin/UID2GMAMediationAdapter.swift
+++ b/Sources/UID2GMAPlugin/UID2GMAMediationAdapter.swift
@@ -20,9 +20,9 @@ class UID2GMAMediationAdapter: NSObject {
}
@available(iOS 13, *)
-extension UID2GMAMediationAdapter: GADRTBAdapter {
+extension UID2GMAMediationAdapter: RTBAdapter {
- static func setUpWith(_ configuration: GADMediationServerConfiguration, completionHandler: @escaping GADMediationAdapterSetUpCompletionBlock) {
+ static func setUp(with configuration: MediationServerConfiguration, completionHandler: @escaping GADMediationAdapterSetUpCompletionBlock) {
guard isOperatingSystemSupported else {
completionHandler(OperatingSystemUnsupportedError())
return
@@ -33,7 +33,7 @@ extension UID2GMAMediationAdapter: GADRTBAdapter {
completionHandler(nil)
}
- func collectSignals(for params: GADRTBRequestParameters, completionHandler: @escaping GADRTBSignalCompletionHandler) {
+ func collectSignals(for params: RTBRequestParameters, completionHandler: @escaping GADRTBSignalCompletionHandler) {
guard isOperatingSystemSupported else {
completionHandler(nil, OperatingSystemUnsupportedError())
return
@@ -47,24 +47,24 @@ extension UID2GMAMediationAdapter: GADRTBAdapter {
}
}
- static func adapterVersion() -> GADVersionNumber {
- var version = GADVersionNumber()
- version.majorVersion = 1
+ static func adapterVersion() -> VersionNumber {
+ var version = VersionNumber()
+ version.majorVersion = 2
version.minorVersion = 0
- version.patchVersion = 1
+ version.patchVersion = 0
return version
}
- static func adSDKVersion() -> GADVersionNumber {
+ static func adSDKVersion() -> VersionNumber {
let uid2Version = UID2SDKProperties.getUID2SDKVersion()
- var version = GADVersionNumber()
+ var version = VersionNumber()
version.majorVersion = uid2Version.major
version.minorVersion = uid2Version.minor
version.patchVersion = uid2Version.patch
return version
}
- static func networkExtrasClass() -> GADAdNetworkExtras.Type? {
+ static func networkExtrasClass() -> AdNetworkExtras.Type? {
return nil
}
diff --git a/Tests/UID2GMAPluginTests/EUIDGMAMediationAdapterTests.swift b/Tests/UID2GMAPluginTests/EUIDGMAMediationAdapterTests.swift
index e5f3b35..eb6b7bb 100644
--- a/Tests/UID2GMAPluginTests/EUIDGMAMediationAdapterTests.swift
+++ b/Tests/UID2GMAPluginTests/EUIDGMAMediationAdapterTests.swift
@@ -24,7 +24,7 @@ final class EUIDGMAMediationAdapterTests: XCTestCase {
)
)
- let signal = try await EUIDGMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ let signal = try await EUIDGMAMediationAdapter().collectSignals(for: RTBRequestParameters())
// Confirm that Adapter returns expected data
XCTAssertEqual("euid-test-token", signal)
@@ -36,7 +36,7 @@ final class EUIDGMAMediationAdapterTests: XCTestCase {
await EUIDManager.shared.resetIdentity()
let result = await Task {
- try await EUIDGMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ try await EUIDGMAMediationAdapter().collectSignals(for: RTBRequestParameters())
}.result
XCTAssertThrowsError(try result.get()) { error in
let adapterError = error as? AdvertisingTokenNotFoundError
@@ -60,7 +60,7 @@ final class EUIDGMAMediationAdapterTests: XCTestCase {
)
let result = await Task {
- try await EUIDGMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ try await EUIDGMAMediationAdapter().collectSignals(for: RTBRequestParameters())
}.result
XCTAssertThrowsError(try result.get()) { error in
let adapterError = error as? AdvertisingTokenNotFoundError
diff --git a/Tests/UID2GMAPluginTests/TestExtensions/GADRTBAdapter+TestExtensions.swift b/Tests/UID2GMAPluginTests/TestExtensions/GADRTBAdapter+TestExtensions.swift
index 5ab0dc4..49288e8 100644
--- a/Tests/UID2GMAPluginTests/TestExtensions/GADRTBAdapter+TestExtensions.swift
+++ b/Tests/UID2GMAPluginTests/TestExtensions/GADRTBAdapter+TestExtensions.swift
@@ -5,8 +5,8 @@
import GoogleMobileAds
/// Adds an async wrapper interface to simplify testing
-extension GADRTBAdapter {
- func collectSignals(for params: GADRTBRequestParameters) async throws -> String? {
+extension RTBAdapter {
+ func collectSignals(for params: RTBRequestParameters) async throws -> String? {
try await withCheckedThrowingContinuation { continuation in
collectSignals(for: params, completionHandler: { signal, error in
guard error == nil else {
diff --git a/Tests/UID2GMAPluginTests/TestExtensions/String+TestExtensions.swift b/Tests/UID2GMAPluginTests/TestExtensions/String+TestExtensions.swift
deleted file mode 100644
index ffab135..0000000
--- a/Tests/UID2GMAPluginTests/TestExtensions/String+TestExtensions.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// File.swift
-//
-//
-// Created by Brad Leege on 3/21/23.
-//
-
-import Foundation
-
-extension String: LocalizedError {
-
- public var errorDescription: String? { return self }
-
-}
diff --git a/Tests/UID2GMAPluginTests/UID2GMAMediationAdapterTests.swift b/Tests/UID2GMAPluginTests/UID2GMAMediationAdapterTests.swift
index 3c985fe..a53fef8 100644
--- a/Tests/UID2GMAPluginTests/UID2GMAMediationAdapterTests.swift
+++ b/Tests/UID2GMAPluginTests/UID2GMAMediationAdapterTests.swift
@@ -26,7 +26,7 @@ final class UID2GMAMediationAdapterTests: XCTestCase {
)
)
- let signal = try await UID2GMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ let signal = try await UID2GMAMediationAdapter().collectSignals(for: RTBRequestParameters())
// Confirm that Adapter returns expected data
XCTAssertEqual("uid2-test-token", signal)
@@ -38,7 +38,7 @@ final class UID2GMAMediationAdapterTests: XCTestCase {
await UID2Manager.shared.resetIdentity()
let result = await Task {
- try await UID2GMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ try await UID2GMAMediationAdapter().collectSignals(for: RTBRequestParameters())
}.result
XCTAssertThrowsError(try result.get()) { error in
let adapterError = error as? AdvertisingTokenNotFoundError
@@ -62,7 +62,7 @@ final class UID2GMAMediationAdapterTests: XCTestCase {
)
let result = await Task {
- try await UID2GMAMediationAdapter().collectSignals(for: GADRTBRequestParameters())
+ try await UID2GMAMediationAdapter().collectSignals(for: RTBRequestParameters())
}.result
XCTAssertThrowsError(try result.get()) { error in
let adapterError = error as? AdvertisingTokenNotFoundError
diff --git a/UID2GMAPlugin.podspec.json b/UID2GMAPlugin.podspec.json
index 1ef0649..0711f9c 100644
--- a/UID2GMAPlugin.podspec.json
+++ b/UID2GMAPlugin.podspec.json
@@ -3,13 +3,13 @@
"summary": "A plugin for integrating UID2 and Google GMA into iOS applications.",
"homepage": "https://unifiedid.com/",
"license": "Apache License, Version 2.0",
- "version": "1.0.1",
+ "version": "2.0.0",
"authors": {
"David Snabel-Caunt": "dave.snabel-caunt@thetradedesk.com"
},
"source": {
"git": "https://github.com/IABTechLab/uid2-ios-plugin-google-gma.git",
- "tag": "v1.0.1"
+ "tag": "v2.0.0"
},
"platforms": {
"ios": "12.0"
@@ -27,8 +27,7 @@
],
"dependencies": {
"Google-Mobile-Ads-SDK": [
- ">= 10.7",
- "< 12.0"
+ "~> 12.0"
],
"UID2": [
">= 1.7.0",