Fix for Xcode 13 Builds but retaining Xcode 12 and older compatibility #433
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…evelop Readme update
|
|
dinesharjani
force-pushed
the
xcode-13-compat-fix
branch
from
78e9334
to
3571416
Compare
In Swift 5.5 Apple changed CBCharacteristic's CBService from being unowned to weak, which breaks the existing code under Xcode 13 whilst at the same time, making said fixes break Xcode 12 due to the change being implemented via Swift versioning. I think this fix should work for both Xcode 13 users downgrading their installed Swift to 5.4 or older as well as the opposite, Xcode 12 users who upgrade their internal Swift version to 5.5 and newer.
philips77
requested changes
Jun 22, 2021
philips77
requested changes
Jun 22, 2021
iOSDFULibrary/Classes/Implementation/LegacyDFU/Characteristics/DFUControlPoint.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/LegacyDFU/Characteristics/DFUControlPoint.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/LegacyDFU/Characteristics/DFUControlPoint.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/LegacyDFU/Characteristics/DFUPacket.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/LegacyDFU/Characteristics/DFUPacket.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/SecureDFUPacket.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/SecureDFUControlPoint.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/SecureDFUControlPoint.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/SecureDFUPacket.swift
Outdated
Show resolved
Hide resolved
iOSDFULibrary/Classes/Implementation/SecureDFU/Characteristics/SecureDFUPacket.swift
Outdated
Show resolved
Hide resolved
dinesharjani
force-pushed
the
xcode-13-compat-fix
branch
from
3571416
to
11173b4
Compare
(I think.)
dinesharjani
force-pushed
the
xcode-13-compat-fix
branch
from
11173b4
to
27f1583
Compare
philips77
approved these changes
Jun 22, 2021
evnik
reviewed
Jun 23, 2021
| @@ -247,7 +251,11 @@ internal struct PacketReceiptNotification { | |||
| self.resetSent = false | |||
|
|
|||
| // Get the peripheral object. | |||
| #if swift(>=5.5) | |||
| guard let peripheral = characteristic.service?.peripheral else { return } | |||
There was a problem hiding this comment.
Should it just return without logging or execution of other logic in this method? Shouldn't it invoke/clear callbacks?
There was a problem hiding this comment.
True. I'll look into it today.
There was a problem hiding this comment.
I'll merge this PR and perhaps prepare another one with following changes.
This was referenced Jun 25, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Swift 5.5 Apple changed CBCharacteristic's CBService from being unowned to weak, which breaks the existing code under Xcode 13 whilst at the same time, making said fixes break Xcode 12 due to the change being implemented via Swift versioning. I think this fix should work for both Xcode 13 users downgrading their installed Swift to 5.4 or older as well as the opposite, Xcode 12 users who upgrade their internal Swift version to 5.5 and newer.