Skip to content
This repository has been archived by the owner on Aug 29, 2022. It is now read-only.

Commit

Permalink
Merge pull request #238 from bignerdranch/zwaldowski/backport-xcode-10
Browse files Browse the repository at this point in the history 
Improve compatibility with Xcode 10
  • Loading branch information
@zwaldowski
zwaldowski authored Jun 19, 2018
2 parents 7a8a1c1 + 0d01f19 commit fefdfa3
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 94 deletions.
2 changes: 1 addition & 1 deletion BNRDeferred.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.name = "BNRDeferred"
s.version = "3.3.1"
s.version = "3.3.2"
s.summary = "Work with values that haven't been determined yet."

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion Configurations/Base.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CODE_SIGN_IDENTITY =
DEVELOPMENT_TEAM =

// Versioning
CURRENT_PROJECT_VERSION = 3.3.1
CURRENT_PROJECT_VERSION = 3.3.2
VERSION_INFO_PREFIX =
VERSIONING_SYSTEM = apple-generic

Expand Down
74 changes: 5 additions & 69 deletions Deferred.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,6 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
DB126C9C1E53685300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CA51E53685300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -273,13 +266,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CB81E53685C00054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CC11E53685D00054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -288,13 +274,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CD41E53686900054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CDD1E53686900054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -303,13 +282,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
DB126CF01E53687300054E95 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -496,10 +468,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 @@ -532,10 +502,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 @@ -568,10 +536,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 @@ -604,10 +570,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 @@ -625,7 +589,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1000;
ORGANIZATIONNAME = "Big Nerd Ranch";
TargetAttributes = {
DB126C9F1E53685300054E95 = {
Expand Down Expand Up @@ -689,55 +653,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
2 changes: 1 addition & 1 deletion Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Deferred.xcodeproj/xcshareddata/xcschemes/MobileDeferred.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Deferred.xcodeproj/xcshareddata/xcschemes/NanoDeferred.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Deferred.xcodeproj/xcshareddata/xcschemes/TVDeferred.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1000"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
38 changes: 19 additions & 19 deletions Gemfile.lock
View file
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.98.0)
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 @@ -90,7 +90,7 @@ GEM
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.1.0, < 2.0.0)
rubyzip (>= 1.2.1, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
Expand All @@ -100,15 +100,15 @@ GEM
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.5.7, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty (~> 0.2.8)
xcpretty-travis-formatter (>= 0.0.3)
ffi (1.9.23)
ffi (1.9.25)
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 All @@ -127,7 +127,7 @@ GEM
httpclient (2.8.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jazzy (0.9.2)
jazzy (0.9.3)
cocoapods (~> 1.0)
mustache (~> 0.99)
open4
Expand Down Expand Up @@ -156,7 +156,7 @@ GEM
mustache (0.99.8)
nanaimo (0.2.5)
nap (1.1.0)
naturally (2.1.0)
naturally (2.2.0)
netrc (0.11.0)
open4 (1.3.4)
os (0.9.6)
Expand All @@ -170,9 +170,9 @@ GEM
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.1)
retriable (3.1.2)
rouge (2.0.7)
ruby-macho (1.1.0)
ruby-macho (1.2.0)
rubyzip (1.2.1)
sass (3.5.6)
sass-listen (~> 4.0.0)
Expand Down Expand Up @@ -205,11 +205,11 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
unicode-display_width (1.4.0)
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

0 comments on commit fefdfa3

Please sign in to comment.