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

Commit fefdfa3

Browse files
zwaldowskizwaldowski
authored
Merge pull request #238 from bignerdranch/zwaldowski/backport-xcode-10
Improve compatibility with Xcode 10
2 parents 7a8a1c1 + 0d01f19 commit fefdfa3

8 files changed

Lines changed: 30 additions & 94 deletions

File tree

‎BNRDeferred.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
33
s.name = "BNRDeferred"
4-
s.version = "3.3.1"
4+
s.version = "3.3.2"
55
s.summary = "Work with values that haven't been determined yet."
66

77
s.description = <<-DESC

‎Configurations/Base.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CODE_SIGN_IDENTITY =
2525
DEVELOPMENT_TEAM =
2626

2727
// Versioning
28-
CURRENT_PROJECT_VERSION = 3.3.1
28+
CURRENT_PROJECT_VERSION = 3.3.2
2929
VERSION_INFO_PREFIX =
3030
VERSIONING_SYSTEM = apple-generic
3131

‎Deferred.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,6 @@
258258
/* End PBXFileReference section */
259259

260260
/* Begin PBXFrameworksBuildPhase section */
261-
DB126C9C1E53685300054E95 /* Frameworks */ = {
262-
isa = PBXFrameworksBuildPhase;
263-
buildActionMask = 2147483647;
264-
files = (
265-
);
266-
runOnlyForDeploymentPostprocessing = 0;
267-
};
268261
DB126CA51E53685300054E95 /* Frameworks */ = {
269262
isa = PBXFrameworksBuildPhase;
270263
buildActionMask = 2147483647;
@@ -273,13 +266,6 @@
273266
);
274267
runOnlyForDeploymentPostprocessing = 0;
275268
};
276-
DB126CB81E53685C00054E95 /* Frameworks */ = {
277-
isa = PBXFrameworksBuildPhase;
278-
buildActionMask = 2147483647;
279-
files = (
280-
);
281-
runOnlyForDeploymentPostprocessing = 0;
282-
};
283269
DB126CC11E53685D00054E95 /* Frameworks */ = {
284270
isa = PBXFrameworksBuildPhase;
285271
buildActionMask = 2147483647;
@@ -288,13 +274,6 @@
288274
);
289275
runOnlyForDeploymentPostprocessing = 0;
290276
};
291-
DB126CD41E53686900054E95 /* Frameworks */ = {
292-
isa = PBXFrameworksBuildPhase;
293-
buildActionMask = 2147483647;
294-
files = (
295-
);
296-
runOnlyForDeploymentPostprocessing = 0;
297-
};
298277
DB126CDD1E53686900054E95 /* Frameworks */ = {
299278
isa = PBXFrameworksBuildPhase;
300279
buildActionMask = 2147483647;
@@ -303,13 +282,6 @@
303282
);
304283
runOnlyForDeploymentPostprocessing = 0;
305284
};
306-
DB126CF01E53687300054E95 /* Frameworks */ = {
307-
isa = PBXFrameworksBuildPhase;
308-
buildActionMask = 2147483647;
309-
files = (
310-
);
311-
runOnlyForDeploymentPostprocessing = 0;
312-
};
313285
/* End PBXFrameworksBuildPhase section */
314286

315287
/* Begin PBXGroup section */
@@ -496,10 +468,8 @@
496468
isa = PBXNativeTarget;
497469
buildConfigurationList = DB126CB11E53685300054E95 /* Build configuration list for PBXNativeTarget "Deferred" */;
498470
buildPhases = (
499-
DB126C9B1E53685300054E95 /* Sources */,
500-
DB126C9C1E53685300054E95 /* Frameworks */,
501471
DB126C9D1E53685300054E95 /* Headers */,
502-
DB126C9E1E53685300054E95 /* Resources */,
472+
DB126C9B1E53685300054E95 /* Sources */,
503473
);
504474
buildRules = (
505475
);
@@ -532,10 +502,8 @@
532502
isa = PBXNativeTarget;
533503
buildConfigurationList = DB126CCD1E53685D00054E95 /* Build configuration list for PBXNativeTarget "MobileDeferred" */;
534504
buildPhases = (
535-
DB126CB71E53685C00054E95 /* Sources */,
536-
DB126CB81E53685C00054E95 /* Frameworks */,
537505
DB126CB91E53685C00054E95 /* Headers */,
538-
DB126CBA1E53685C00054E95 /* Resources */,
506+
DB126CB71E53685C00054E95 /* Sources */,
539507
);
540508
buildRules = (
541509
);
@@ -568,10 +536,8 @@
568536
isa = PBXNativeTarget;
569537
buildConfigurationList = DB126CE91E53686900054E95 /* Build configuration list for PBXNativeTarget "TVDeferred" */;
570538
buildPhases = (
571-
DB126CD31E53686900054E95 /* Sources */,
572-
DB126CD41E53686900054E95 /* Frameworks */,
573539
DB126CD51E53686900054E95 /* Headers */,
574-
DB126CD61E53686900054E95 /* Resources */,
540+
DB126CD31E53686900054E95 /* Sources */,
575541
);
576542
buildRules = (
577543
);
@@ -604,10 +570,8 @@
604570
isa = PBXNativeTarget;
605571
buildConfigurationList = DB126CF91E53687300054E95 /* Build configuration list for PBXNativeTarget "NanoDeferred" */;
606572
buildPhases = (
607-
DB126CEF1E53687300054E95 /* Sources */,
608-
DB126CF01E53687300054E95 /* Frameworks */,
609573
DB126CF11E53687300054E95 /* Headers */,
610-
DB126CF21E53687300054E95 /* Resources */,
574+
DB126CEF1E53687300054E95 /* Sources */,
611575
);
612576
buildRules = (
613577
);
@@ -625,7 +589,7 @@
625589
isa = PBXProject;
626590
attributes = {
627591
LastSwiftUpdateCheck = 0820;
628-
LastUpgradeCheck = 0930;
592+
LastUpgradeCheck = 1000;
629593
ORGANIZATIONNAME = "Big Nerd Ranch";
630594
TargetAttributes = {
631595
DB126C9F1E53685300054E95 = {
@@ -689,55 +653,27 @@
689653
/* End PBXProject section */
690654

691655
/* Begin PBXResourcesBuildPhase section */
692-
DB126C9E1E53685300054E95 /* Resources */ = {
693-
isa = PBXResourcesBuildPhase;
694-
buildActionMask = 2147483647;
695-
files = (
696-
);
697-
runOnlyForDeploymentPostprocessing = 0;
698-
};
699656
DB126CA61E53685300054E95 /* Resources */ = {
700657
isa = PBXResourcesBuildPhase;
701658
buildActionMask = 2147483647;
702659
files = (
703660
);
704661
runOnlyForDeploymentPostprocessing = 0;
705662
};
706-
DB126CBA1E53685C00054E95 /* Resources */ = {
707-
isa = PBXResourcesBuildPhase;
708-
buildActionMask = 2147483647;
709-
files = (
710-
);
711-
runOnlyForDeploymentPostprocessing = 0;
712-
};
713663
DB126CC21E53685D00054E95 /* Resources */ = {
714664
isa = PBXResourcesBuildPhase;
715665
buildActionMask = 2147483647;
716666
files = (
717667
);
718668
runOnlyForDeploymentPostprocessing = 0;
719669
};
720-
DB126CD61E53686900054E95 /* Resources */ = {
721-
isa = PBXResourcesBuildPhase;
722-
buildActionMask = 2147483647;
723-
files = (
724-
);
725-
runOnlyForDeploymentPostprocessing = 0;
726-
};
727670
DB126CDE1E53686900054E95 /* Resources */ = {
728671
isa = PBXResourcesBuildPhase;
729672
buildActionMask = 2147483647;
730673
files = (
731674
);
732675
runOnlyForDeploymentPostprocessing = 0;
733676
};
734-
DB126CF21E53687300054E95 /* Resources */ = {
735-
isa = PBXResourcesBuildPhase;
736-
buildActionMask = 2147483647;
737-
files = (
738-
);
739-
runOnlyForDeploymentPostprocessing = 0;
740-
};
741677
/* End PBXResourcesBuildPhase section */
742678

743679
/* Begin PBXSourcesBuildPhase section */

‎Deferred.xcodeproj/xcshareddata/xcschemes/Deferred.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Deferred.xcodeproj/xcshareddata/xcschemes/MobileDeferred.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Deferred.xcodeproj/xcshareddata/xcschemes/NanoDeferred.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Deferred.xcodeproj/xcshareddata/xcschemes/TVDeferred.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Gemfile.lock‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ GEM
1212
atomos (0.1.2)
1313
babosa (1.0.2)
1414
claide (1.0.2)
15-
cocoapods (1.5.2)
15+
cocoapods (1.5.3)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.5.2)
18+
cocoapods-core (= 1.5.3)
1919
cocoapods-deintegrate (>= 1.0.2, < 2.0)
2020
cocoapods-downloader (>= 1.2.0, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,12 +31,12 @@ GEM
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.1)
3333
xcodeproj (>= 1.5.7, < 2.0)
34-
cocoapods-core (1.5.2)
34+
cocoapods-core (1.5.3)
3535
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
3838
cocoapods-deintegrate (1.0.2)
39-
cocoapods-downloader (1.2.0)
39+
cocoapods-downloader (1.2.1)
4040
cocoapods-plugins (1.0.0)
4141
nap
4242
cocoapods-search (1.0.0)
@@ -58,15 +58,15 @@ GEM
5858
emoji_regex (0.1.1)
5959
escape (0.0.4)
6060
excon (0.62.0)
61-
faraday (0.15.1)
61+
faraday (0.15.2)
6262
multipart-post (>= 1.2, < 3)
6363
faraday-cookie_jar (0.0.6)
6464
faraday (>= 0.7.4)
6565
http-cookie (~> 1.0.0)
6666
faraday_middleware (0.12.2)
6767
faraday (>= 0.7.4, < 1.0)
6868
fastimage (2.1.3)
69-
fastlane (2.95.0)
69+
fastlane (2.98.0)
7070
CFPropertyList (>= 2.3, < 4.0.0)
7171
addressable (>= 2.3, < 3.0.0)
7272
babosa (>= 1.0.2, < 2.0.0)
@@ -81,7 +81,7 @@ GEM
8181
faraday_middleware (~> 0.9)
8282
fastimage (>= 2.1.0, < 3.0.0)
8383
gh_inspector (>= 1.1.2, < 2.0.0)
84-
google-api-client (>= 0.13.1, < 0.14.0)
84+
google-api-client (>= 0.21.2, < 0.22.0)
8585
highline (>= 1.7.2, < 2.0.0)
8686
json (< 3.0.0)
8787
mini_magick (~> 4.5.1)
@@ -90,7 +90,7 @@ GEM
9090
multipart-post (~> 2.0.0)
9191
plist (>= 3.1.0, < 4.0.0)
9292
public_suffix (~> 2.0.0)
93-
rubyzip (>= 1.1.0, < 2.0.0)
93+
rubyzip (>= 1.2.1, < 2.0.0)
9494
security (= 0.1.3)
9595
simctl (~> 1.6.3)
9696
slack-notifier (>= 2.0.0, < 3.0.0)
@@ -100,15 +100,15 @@ GEM
100100
tty-spinner (>= 0.8.0, < 1.0.0)
101101
word_wrap (~> 1.0.0)
102102
xcodeproj (>= 1.5.7, < 2.0.0)
103-
xcpretty (>= 0.2.4, < 1.0.0)
103+
xcpretty (~> 0.2.8)
104104
xcpretty-travis-formatter (>= 0.0.3)
105-
ffi (1.9.23)
105+
ffi (1.9.25)
106106
fourflusher (2.0.1)
107107
fuzzy_match (2.0.4)
108108
gh_inspector (1.1.3)
109-
google-api-client (0.13.6)
109+
google-api-client (0.21.2)
110110
addressable (~> 2.5, >= 2.5.1)
111-
googleauth (~> 0.5)
111+
googleauth (>= 0.5, < 0.7.0)
112112
httpclient (>= 2.8.1, < 3.0)
113113
mime-types (~> 3.0)
114114
representable (~> 3.0)
@@ -127,7 +127,7 @@ GEM
127127
httpclient (2.8.3)
128128
i18n (0.9.5)
129129
concurrent-ruby (~> 1.0)
130-
jazzy (0.9.2)
130+
jazzy (0.9.3)
131131
cocoapods (~> 1.0)
132132
mustache (~> 0.99)
133133
open4
@@ -156,7 +156,7 @@ GEM
156156
mustache (0.99.8)
157157
nanaimo (0.2.5)
158158
nap (1.1.0)
159-
naturally (2.1.0)
159+
naturally (2.2.0)
160160
netrc (0.11.0)
161161
open4 (1.3.4)
162162
os (0.9.6)
@@ -170,9 +170,9 @@ GEM
170170
declarative (< 0.1.0)
171171
declarative-option (< 0.2.0)
172172
uber (< 0.2.0)
173-
retriable (3.1.1)
173+
retriable (3.1.2)
174174
rouge (2.0.7)
175-
ruby-macho (1.1.0)
175+
ruby-macho (1.2.0)
176176
rubyzip (1.2.1)
177177
sass (3.5.6)
178178
sass-listen (~> 4.0.0)
@@ -205,11 +205,11 @@ GEM
205205
unf (0.1.4)
206206
unf_ext
207207
unf_ext (0.0.7.5)
208-
unicode-display_width (1.3.2)
208+
unicode-display_width (1.4.0)
209209
word_wrap (1.0.0)
210210
xcinvoke (0.3.0)
211211
liferaft (~> 0.0.6)
212-
xcodeproj (1.5.8)
212+
xcodeproj (1.5.9)
213213
CFPropertyList (>= 2.3.3, < 4.0)
214214
atomos (~> 0.1.2)
215215
claide (>= 1.0.2, < 2.0)
@@ -230,4 +230,4 @@ DEPENDENCIES
230230
semantic
231231

232232
BUNDLED WITH
233-
1.16.1
233+
1.16.2

0 commit comments

Comments
 (0)