Skip to content
This repository was archived by the owner on Aug 29, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 5 additions & 69 deletions Deferred.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,6 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
DB126C9C1E53685300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CA51E53685300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -316,13 +309,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CB81E53685C00054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CC11E53685D00054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -331,13 +317,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CD41E53686900054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CDD1E53686900054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -346,13 +325,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CF01E53687300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -548,10 +520,8 @@
isa = PBXNativeTarget;
buildConfigurationList = DB126CB11E53685300054E95 /* Build configuration list for PBXNativeTarget "Deferred" */;
buildPhases = (
DB126C9B1E53685300054E95 /* Sources */,
DB126C9C1E53685300054E95 /* Frameworks */,
DB126C9D1E53685300054E95 /* Headers */,
DB126C9E1E53685300054E95 /* Resources */,
DB126C9B1E53685300054E95 /* Sources */,
);
buildRules = (
);
Expand Down Expand Up @@ -584,10 +554,8 @@
isa = PBXNativeTarget;
buildConfigurationList = DB126CCD1E53685D00054E95 /* Build configuration list for PBXNativeTarget "MobileDeferred" */;
buildPhases = (
DB126CB71E53685C00054E95 /* Sources */,
DB126CB81E53685C00054E95 /* Frameworks */,
DB126CB91E53685C00054E95 /* Headers */,
DB126CBA1E53685C00054E95 /* Resources */,
DB126CB71E53685C00054E95 /* Sources */,
);
buildRules = (
);
Expand Down Expand Up @@ -620,10 +588,8 @@
isa = PBXNativeTarget;
buildConfigurationList = DB126CE91E53686900054E95 /* Build configuration list for PBXNativeTarget "TVDeferred" */;
buildPhases = (
DB126CD31E53686900054E95 /* Sources */,
DB126CD41E53686900054E95 /* Frameworks */,
DB126CD51E53686900054E95 /* Headers */,
DB126CD61E53686900054E95 /* Resources */,
DB126CD31E53686900054E95 /* Sources */,
);
buildRules = (
);
Expand Down Expand Up @@ -656,10 +622,8 @@
isa = PBXNativeTarget;
buildConfigurationList = DB126CF91E53687300054E95 /* Build configuration list for PBXNativeTarget "NanoDeferred" */;
buildPhases = (
DB126CEF1E53687300054E95 /* Sources */,
DB126CF01E53687300054E95 /* Frameworks */,
DB126CF11E53687300054E95 /* Headers */,
DB126CF21E53687300054E95 /* Resources */,
DB126CEF1E53687300054E95 /* Sources */,
);
buildRules = (
);
Expand All @@ -677,7 +641,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = "Big Nerd Ranch";
TargetAttributes = {
DB126C9F1E53685300054E95 = {
Expand Down Expand Up @@ -741,55 +705,27 @@
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
DB126C9E1E53685300054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CA61E53685300054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CBA1E53685C00054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CC21E53685D00054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CD61E53686900054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CDE1E53686900054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CF21E53687300054E95 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ GEM
atomos (0.1.2)
babosa (1.0.2)
claide (1.0.2)
cocoapods (1.5.2)
cocoapods (1.5.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.2)
cocoapods-core (= 1.5.3)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -31,12 +31,12 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.2)
cocoapods-core (1.5.3)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.0)
cocoapods-downloader (1.2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand All @@ -58,15 +58,15 @@ GEM
emoji_regex (0.1.1)
escape (0.0.4)
excon (0.62.0)
faraday (0.15.1)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.3)
fastlane (2.95.0)
fastlane (2.96.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
Expand All @@ -81,7 +81,7 @@ GEM
faraday_middleware (~> 0.9)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.13.1, < 0.14.0)
google-api-client (>= 0.21.2, < 0.22.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
Expand All @@ -106,9 +106,9 @@ GEM
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-api-client (0.13.6)
google-api-client (0.21.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.5)
googleauth (>= 0.5, < 0.7.0)
httpclient (>= 2.8.1, < 3.0)
mime-types (~> 3.0)
representable (~> 3.0)
Expand Down Expand Up @@ -209,7 +209,7 @@ GEM
word_wrap (1.0.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.5.8)
xcodeproj (1.5.9)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.2)
claide (>= 1.0.2, < 2.0)
Expand All @@ -230,4 +230,4 @@ DEPENDENCIES
semantic

BUNDLED WITH
1.16.1
1.16.2
11 changes: 5 additions & 6 deletions Sources/Task/TaskProgress.swift
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,14 @@ private final class ProxyProgress: Progress {
override func observeValue(forKeyPath keyPath: String?, of _: Any?, change _: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
let state = State(rawValue: bnr_atomic_load(&self.state, .relaxed))
guard state.contains(.ready), let observer = observer else { return }
switch context {
case (&Observation.cancelledContext)?:
// This would be prettier as a switch.
// https://bugs.swift.org/browse/SR-7877
if context == &Observation.cancelledContext {
observer.inheritCancelled()
case (&Observation.pausedContext)?:
} else if context == &Observation.pausedContext {
observer.inheritPaused()
case (&Observation.attributesContext)?:
} else if context == &Observation.attributesContext {
observer.inheritValue(forKeyPath: keyPath)
default:
preconditionFailure("Unexpected KVO context for private object")
}
}
}
Expand Down