Skip to content

Commit b230e2f

Browse files
committed
Raise minimum iOS deployment target from 12.0 to 15.0
The GoogleInteractiveMediaAds Swift Package declares iOS 15.0 as its minimum platform version. Swift Package Manager enforces that a consuming package's minimum must be ≥ all its dependencies' minimums. Raise minimum iOS version from 12.0 to 15.0 for both SPM and CocoaPods. Expand UID2 dependency version range to include v3.x Remove redundant OperatingSystemSupport check for iOS 12. Increase version of this plugin to 2.0.0 for breaking changes.
1 parent b17a4a7 commit b230e2f

7 files changed

Lines changed: 90 additions & 52 deletions

File tree

Development/UID2GoogleIMADevelopmentApp/UID2GoogleIMADevelopmentApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 42 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.resolved

Lines changed: 38 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ let package = Package(
77
name: "UID2IMAPlugin",
88
defaultLocalization: "en",
99
platforms: [
10-
.iOS(.v12)
10+
.iOS(.v15)
1111
],
1212
products: [
1313
.library(
1414
name: "UID2IMAPlugin",
1515
targets: ["UID2IMAPlugin"])
1616
],
1717
dependencies: [
18-
.package(url: "https://github.com/IABTechLab/uid2-ios-sdk.git", "1.7.0" ..< "3.0.0"),
18+
.package(url: "https://github.com/IABTechLab/uid2-ios-sdk.git", "1.7.0" ..< "4.0.0"),
1919
.package(url: "https://github.com/googleads/swift-package-manager-google-interactive-media-ads-ios.git", from: "3.18.5")
2020
],
2121
targets: [

Sources/UID2IMAPlugin/EUIDIMASecureSignalsAdapter.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import UID2
1111
public class EUIDIMASecureSignalsAdapter: NSObject {
1212

1313
required public override init() {
14-
guard isOperatingSystemSupported else {
15-
return
16-
}
1714
// Ensure UID2Manager has started
1815
_ = EUIDManager.shared
1916
}
@@ -25,9 +22,9 @@ extension EUIDIMASecureSignalsAdapter: IMASecureSignalsAdapter {
2522

2623
public static func adapterVersion() -> IMAVersion {
2724
let version = IMAVersion()
28-
version.majorVersion = 1
25+
version.majorVersion = 2
2926
version.minorVersion = 0
30-
version.patchVersion = 4
27+
version.patchVersion = 0
3128
return version
3229
}
3330

@@ -41,10 +38,6 @@ extension EUIDIMASecureSignalsAdapter: IMASecureSignalsAdapter {
4138
}
4239

4340
public func collectSignals(completion: @escaping IMASignalCompletionHandler) {
44-
guard isOperatingSystemSupported else {
45-
completion(nil, OperatingSystemUnsupportedError())
46-
return
47-
}
4841
Task {
4942
guard let advertisingToken = await EUIDManager.shared.getAdvertisingToken() else {
5043
completion(nil, AdvertisingTokenNotFoundError())

Sources/UID2IMAPlugin/OperatingSystemSupport.swift

Lines changed: 0 additions & 20 deletions
This file was deleted.

Sources/UID2IMAPlugin/UID2IMASecureSignalsAdapter.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ import UID2
1414
public class UID2IMASecureSignalsAdapter: NSObject {
1515

1616
required public override init() {
17-
guard isOperatingSystemSupported else {
18-
return
19-
}
2017
// Ensure UID2Manager has started
2118
_ = UID2Manager.shared
2219
}
@@ -28,9 +25,9 @@ extension UID2IMASecureSignalsAdapter: IMASecureSignalsAdapter {
2825

2926
public static func adapterVersion() -> IMAVersion {
3027
let version = IMAVersion()
31-
version.majorVersion = 1
28+
version.majorVersion = 2
3229
version.minorVersion = 0
33-
version.patchVersion = 4
30+
version.patchVersion = 0
3431
return version
3532
}
3633

@@ -44,10 +41,6 @@ extension UID2IMASecureSignalsAdapter: IMASecureSignalsAdapter {
4441
}
4542

4643
public func collectSignals(completion: @escaping IMASignalCompletionHandler) {
47-
guard isOperatingSystemSupported else {
48-
completion(nil, OperatingSystemUnsupportedError())
49-
return
50-
}
5144
Task {
5245
guard let advertisingToken = await UID2Manager.shared.getAdvertisingToken() else {
5346
completion(nil, AdvertisingTokenNotFoundError())

UID2IMAPlugin.podspec.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"summary": "A plugin for integrating UID2 and Google IMA into iOS applications.",
44
"homepage": "https://unifiedid.com/",
55
"license": "Apache License, Version 2.0",
6-
"version": "1.0.4",
6+
"version": "2.0.0",
77
"authors": {
88
"David Snabel-Caunt": "dave.snabel-caunt@thetradedesk.com"
99
},
1010
"source": {
1111
"git": "https://github.com/IABTechLab/uid2-ios-plugin-google-ima.git",
12-
"tag": "v1.0.4"
12+
"tag": "v2.0.0"
1313
},
1414
"platforms": {
15-
"ios": "12.0"
15+
"ios": "15.0"
1616
},
1717
"swift_versions": [
1818
"5"
@@ -31,7 +31,7 @@
3131
],
3232
"UID2": [
3333
">= 1.7.0",
34-
"< 3.0"
34+
"< 4.0"
3535
]
3636
}
3737
}

0 commit comments

Comments
 (0)