Skip to content

GoogleDataTransport: deprecated API conditions #6697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 8, 2020
Merged

GoogleDataTransport: deprecated API conditions #6697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9c66e9
GoogleDataTransport: deprecated API conditions
maksymmalyhin Oct 8, 2020
6f42f6e
Version bump
maksymmalyhin Oct 8, 2020
5a16005
use `TARGET_OS_IOS`
maksymmalyhin Oct 8, 2020
bed73d6
changelog
maksymmalyhin Oct 8, 2020
b241deb
changelog
maksymmalyhin Oct 8, 2020
5414bd3
style
maksymmalyhin Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GoogleDataTransport.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GoogleDataTransport'
s.version = '7.5.0'
s.version = '7.5.1'
s.summary = 'Google iOS SDK data transport.'

s.description = <<-DESC
Expand Down
5 changes: 4 additions & 1 deletion GoogleDataTransport/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Unreleased
# v7.5.1
- Fix deprecation warning for iOS 12.0 and higher projects. (#6682)

# v7.5.0
- Legacy pre Xcode 10 compatibility checks removed. (#6486)
- `GDTCORDirectorySizeTracker` crash fixed. (#6540)

Expand Down
8 changes: 5 additions & 3 deletions GoogleDataTransport/GDTCORLibrary/GDTCORPlatform.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
if (networkCurrentRadioAccessTechnologyDict.count) {
networkCurrentRadioAccessTechnology = networkCurrentRadioAccessTechnologyDict.allValues[0];
}
#else // TARGET_OS_MACCATALYST
#else // TARGET_OS_MACCATALYST
if (@available(iOS 12.0, *)) {
NSDictionary<NSString *, NSString *> *networkCurrentRadioAccessTechnologyDict =
networkInfo.serviceCurrentRadioAccessTechnology;
Expand All @@ -137,7 +137,9 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
networkCurrentRadioAccessTechnology = networkCurrentRadioAccessTechnologyDict.allValues[0];
}
} else {
#if TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED < 120000
networkCurrentRadioAccessTechnology = networkInfo.currentRadioAccessTechnology;
#endif // TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED < 120000
}
#endif // TARGET_OS_MACCATALYST
if (networkCurrentRadioAccessTechnology) {
Expand All @@ -147,9 +149,9 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
} else {
return GDTCORNetworkMobileSubtypeUNKNOWN;
}
#else
#else // TARGET_OS_IOS
return GDTCORNetworkMobileSubtypeUNKNOWN;
#endif
#endif // TARGET_OS_IOS
}

NSString *_Nonnull GDTCORDeviceModel() {
Expand Down