Upgrade to Swift 5.2
This commit is contained in:
parent
9d66061171
commit
75a2479483
|
@ -8,6 +8,6 @@ Pod::Spec.new do |s|
|
||||||
s.authors = { 'Sindre Sorhus' => 'sindresorhus@gmail.com' }
|
s.authors = { 'Sindre Sorhus' => 'sindresorhus@gmail.com' }
|
||||||
s.source = { :git => 'https://github.com/sindresorhus/DockProgress.git', :tag => "v#{s.version}" }
|
s.source = { :git => 'https://github.com/sindresorhus/DockProgress.git', :tag => "v#{s.version}" }
|
||||||
s.source_files = 'Sources/**/*.swift'
|
s.source_files = 'Sources/**/*.swift'
|
||||||
s.swift_version = '5.1'
|
s.swift_version = '5.2'
|
||||||
s.platform = :macos, '10.12'
|
s.platform = :macos, '10.12'
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// swift-tools-version:5.1
|
// swift-tools-version:5.2
|
||||||
import PackageDescription
|
import PackageDescription
|
||||||
|
|
||||||
let package = Package(
|
let package = Package(
|
||||||
|
|
|
@ -12,11 +12,17 @@ public final class DockProgress {
|
||||||
public static weak var progressInstance: Progress? {
|
public static weak var progressInstance: Progress? {
|
||||||
didSet {
|
didSet {
|
||||||
guard let progressInstance = progressInstance else {
|
guard let progressInstance = progressInstance else {
|
||||||
|
progressObserver = nil
|
||||||
|
finishedObserver = nil
|
||||||
|
resetProgress()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
progressObserver = progressInstance.observe(\.fractionCompleted) { sender, _ in
|
progressObserver = progressInstance.observe(\.fractionCompleted) { sender, _ in
|
||||||
guard !sender.isCancelled, !sender.isFinished else {
|
guard
|
||||||
|
!sender.isCancelled,
|
||||||
|
!sender.isFinished
|
||||||
|
else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,7 +30,10 @@ public final class DockProgress {
|
||||||
}
|
}
|
||||||
|
|
||||||
finishedObserver = progressInstance.observe(\.isFinished) { sender, _ in
|
finishedObserver = progressInstance.observe(\.isFinished) { sender, _ in
|
||||||
guard !sender.isCancelled, sender.isFinished else {
|
guard
|
||||||
|
!sender.isCancelled,
|
||||||
|
sender.isFinished
|
||||||
|
else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue