Skip to content

Commit

Permalink
Merge release-6.34.0 branch after patch (#6701)
Browse files Browse the repository at this point in the history
* Update versions for Release 6.34.0

* 6.34.0 updates for SwiftPM (#6614)

* M81 FIS cherry pick of #6570 (#6616)

* FIS: Additional FIRInstallationsItem validation (#6570)

* FIS API tests for no FID in response

* FIRInstallationsIDControllerTests: test names

* FIRInstallationsIDControllerTests: corrupted storage tests

* FIRInstallationsItem validation

* Fix FIRInstallationsItem.IIDDefaultToken copy

* Improve error description.

* FIRInstallationsItem validation error

* FIRInstallationsItem validation tests

* ./scripts/style.sh

* FIRInstallationsIDController: validate stored installation

* FIRInstallationsAPIService installation validation

* Changelog

* Update versions

* patch version

* release manifest

* FIS: don't log anything on success validation (#6635)

* Update changelogs (#6649)

* GoogleDataTransport: deprecated API conditions (#6697)

* GoogleDataTransport: deprecated API conditions

* Version bump

* use `TARGET_OS_IOS`

* changelog

* changelog

* style

* Fix merge

Co-authored-by: Ryan Wilson <wilsonryan@google.com>
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
Co-authored-by: Morgan Chen <morganchen12@gmail.com>
  • Loading branch information
4 people committed Oct 8, 2020
1 parent 409a3cc commit bff6b66
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion GoogleDataTransport.podspec
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
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
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

0 comments on commit bff6b66

Please sign in to comment.