Skip to content

Commit 707652b

Browse files
crsantoscrsantos
authored
bump iOS deployment target to 10.0
Fixes build issues with newer Xcodes Removes Alamofire, Bolts and OMGHTTPURLRQ subspecs (#1318) This will require a major version bump as a result Also: * macOS to 10.13 * tvos to 10.0 * watchos to 4.0
1 parent 76e1fb0 commit 707652b

File tree

7 files changed

+73
-104
lines changed

7 files changed

+73
-104
lines changed

‎.github/workflows/ci-podspec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
- uses: actions/checkout@v2
1111
with:
1212
submodules: true
13-
- run: pod lib lint --fail-fast
13+
- run: pod lib lint --fail-fast --allow-warnings

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: actions/checkout@v2
3131
with:
3232
submodules: true
33-
- run: pod lib lint --fail-fast
33+
- run: pod lib lint --fail-fast --allow-warnings
3434

3535
create-release:
3636
runs-on: ubuntu-latest

‎PromiseKit.podspec

Lines changed: 56 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
2424
# CocoaPods requires us to specify the root deployment targets
2525
# even though for us it is nonsense. Our root spec has no
2626
# sources.
27-
s.ios.deployment_target = '8.0'
28-
s.osx.deployment_target = '10.10'
29-
s.watchos.deployment_target = '2.0'
30-
s.tvos.deployment_target = '9.0'
27+
s.ios.deployment_target = '10.0'
28+
s.osx.deployment_target = '10.13'
29+
s.watchos.deployment_target = '4.0'
30+
s.tvos.deployment_target = '10.0'
3131

3232
s.pod_target_xcconfig = {
3333
'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods',
@@ -38,54 +38,32 @@ Pod::Spec.new do |s|
3838
ss.exclude_files = 'Extensions/Accounts/Sources/*.plist'
3939
ss.ios.frameworks = ss.osx.frameworks = 'Accounts'
4040
ss.dependency 'PromiseKit/CorePromise'
41-
ss.ios.deployment_target = '8.0'
42-
ss.osx.deployment_target = '10.10'
43-
end
44-
45-
s.subspec 'Alamofire' do |ss|
46-
ss.source_files = 'Extensions/Alamofire/Sources/**/*'
47-
ss.exclude_files = 'Extensions/Alamofire/Sources/*.plist'
48-
ss.dependency 'Alamofire', '~> 4.0'
49-
ss.dependency 'PromiseKit/CorePromise'
50-
ss.ios.deployment_target = '8.0'
51-
ss.osx.deployment_target = '10.11'
52-
ss.watchos.deployment_target = '2.0'
53-
ss.tvos.deployment_target = '9.0'
41+
ss.ios.deployment_target = '10.0'
42+
ss.osx.deployment_target = '10.13'
5443
end
5544

5645
s.subspec 'AddressBook' do |ss|
5746
ss.ios.source_files = 'Extensions/AddressBook/Sources/**/*'
5847
ss.exclude_files = 'Extensions/AddressBook/Sources/*.plist'
5948
ss.ios.frameworks = 'AddressBook'
6049
ss.dependency 'PromiseKit/CorePromise'
61-
ss.ios.deployment_target = '8.0'
50+
ss.ios.deployment_target = '10.0'
6251
end
6352

6453
s.subspec 'AssetsLibrary' do |ss|
6554
ss.ios.source_files = 'Extensions/AssetsLibrary/Sources/**/*'
6655
ss.exclude_files = 'Extensions/AssetsLibrary/Sources/*.plist'
6756
ss.ios.frameworks = 'AssetsLibrary'
6857
ss.dependency 'PromiseKit/CorePromise'
69-
ss.ios.deployment_target = '8.0'
58+
ss.ios.deployment_target = '10.0'
7059
end
7160

7261
s.subspec 'AVFoundation' do |ss|
7362
ss.ios.source_files = 'Extensions/AVFoundation/Sources/**/*'
7463
ss.exclude_files = 'Extensions/AVFoundation/Sources/*.plist'
7564
ss.ios.frameworks = 'AVFoundation'
7665
ss.dependency 'PromiseKit/CorePromise'
77-
ss.ios.deployment_target = '8.0'
78-
end
79-
80-
s.subspec 'Bolts' do |ss|
81-
ss.source_files = 'Extensions/Bolts/Sources/**/*'
82-
ss.exclude_files = 'Extensions/Bolts/Sources/*.plist'
83-
ss.dependency 'PromiseKit/CorePromise'
84-
ss.dependency 'Bolts', '~> 1.9.0'
85-
ss.ios.deployment_target = '8.0'
86-
ss.osx.deployment_target = '10.10'
87-
ss.watchos.deployment_target = '2.0'
88-
ss.tvos.deployment_target = '9.0'
66+
ss.ios.deployment_target = '10.0'
8967
end
9068

9169
s.subspec 'CloudKit' do |ss|
@@ -94,19 +72,19 @@ Pod::Spec.new do |s|
9472
ss.frameworks = 'CloudKit'
9573
ss.dependency 'PromiseKit/CorePromise'
9674
ss.ios.deployment_target = '10.0'
97-
ss.osx.deployment_target = '10.12'
75+
ss.osx.deployment_target = '10.13'
9876
ss.tvos.deployment_target = '10.0'
99-
ss.watchos.deployment_target = '3.0'
77+
ss.watchos.deployment_target = '4.0'
10078
end
10179

10280
s.subspec 'CoreBluetooth' do |ss|
10381
ss.ios.source_files = ss.osx.source_files = ss.tvos.source_files = 'Extensions/CoreBluetooth/Sources/**/*'
10482
ss.exclude_files = 'Extensions/CoreBluetooth/Sources/*.plist'
10583
ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'CoreBluetooth'
10684
ss.dependency 'PromiseKit/CorePromise'
107-
ss.ios.deployment_target = '8.0'
108-
ss.osx.deployment_target = '10.10'
109-
ss.tvos.deployment_target = '9.0'
85+
ss.ios.deployment_target = '10.0'
86+
ss.osx.deployment_target = '10.13'
87+
ss.tvos.deployment_target = '10.0'
11088
end
11189

11290
s.subspec 'CorePromise' do |ss|
@@ -122,10 +100,10 @@ Pod::Spec.new do |s|
122100
ss.preserve_paths = 'Sources/AnyPromise+Private.h', 'Sources/PMKCallVariadicBlock.m', 'Sources/NSMethodSignatureForBlock.m'
123101
ss.frameworks = 'Foundation'
124102

125-
ss.ios.deployment_target = '8.0'
126-
ss.osx.deployment_target = '10.10'
127-
ss.watchos.deployment_target = '2.0'
128-
ss.tvos.deployment_target = '9.0'
103+
ss.ios.deployment_target = '10.0'
104+
ss.osx.deployment_target = '10.13'
105+
ss.watchos.deployment_target = '4.0'
106+
ss.tvos.deployment_target = '10.0'
129107
end
130108

131109
s.subspec 'CoreLocation' do |ss|
@@ -135,10 +113,10 @@ Pod::Spec.new do |s|
135113
ss.dependency 'PromiseKit/CorePromise'
136114
ss.frameworks = 'CoreLocation'
137115

138-
ss.ios.deployment_target = '8.0'
139-
ss.osx.deployment_target = '10.10'
140-
ss.watchos.deployment_target = '3.0'
141-
ss.tvos.deployment_target = '9.0'
116+
ss.ios.deployment_target = '10.0'
117+
ss.osx.deployment_target = '10.13'
118+
ss.watchos.deployment_target = '4.0'
119+
ss.tvos.deployment_target = '10.0'
142120
end
143121

144122
s.subspec 'EventKit' do |ss|
@@ -147,69 +125,58 @@ Pod::Spec.new do |s|
147125
ss.ios.frameworks = ss.osx.frameworks = ss.watchos.frameworks = 'EventKit'
148126
ss.dependency 'PromiseKit/CorePromise'
149127

150-
ss.ios.deployment_target = '8.0'
151-
ss.osx.deployment_target = '10.10'
152-
ss.watchos.deployment_target = '2.0'
128+
ss.ios.deployment_target = '10.0'
129+
ss.osx.deployment_target = '10.13'
130+
ss.watchos.deployment_target = '4.0'
153131
end
154132

155133
s.subspec 'Foundation' do |ss|
156134
ss.source_files = Dir['Extensions/Foundation/Sources/**/*']
157135
ss.exclude_files = 'Extensions/Foundation/Sources/*.plist'
158136
ss.dependency 'PromiseKit/CorePromise'
159137
ss.frameworks = 'Foundation'
160-
ss.ios.deployment_target = '8.0'
161-
ss.osx.deployment_target = '10.10'
162-
ss.watchos.deployment_target = '2.0'
163-
ss.tvos.deployment_target = '9.0'
138+
ss.ios.deployment_target = '10.0'
139+
ss.osx.deployment_target = '10.13'
140+
ss.watchos.deployment_target = '4.0'
141+
ss.tvos.deployment_target = '10.0'
164142
end
165143

166144
s.subspec 'HealthKit' do |ss|
167145
ss.source_files = Dir['Extensions/HealthKit/Sources/**/*']
168146
ss.exclude_files = 'Extensions/HealthKit/Sources/*.plist'
169147
ss.dependency 'PromiseKit/CorePromise'
170148
ss.frameworks = 'HealthKit'
171-
ss.ios.deployment_target = '9.0'
172-
ss.watchos.deployment_target = '2.0'
149+
ss.ios.deployment_target = '10.0'
150+
ss.watchos.deployment_target = '4.0'
173151
end
174152

175153
s.subspec 'HomeKit' do |ss|
176154
ss.source_files = Dir['Extensions/HomeKit/Sources/**/*']
177155
ss.exclude_files = 'Extensions/HomeKit/Sources/*.plist'
178156
ss.dependency 'PromiseKit/CorePromise'
179157
ss.frameworks = 'HomeKit'
180-
ss.ios.deployment_target = '8.0'
181-
ss.watchos.deployment_target = '3.0'
182-
ss.tvos.deployment_target = '9.0'
158+
ss.ios.deployment_target = '10.0'
159+
ss.watchos.deployment_target = '4.0'
160+
ss.tvos.deployment_target = '10.0'
183161
end
184162

185163
s.subspec 'MapKit' do |ss|
186164
ss.ios.source_files = ss.osx.source_files = ss.tvos.source_files = 'Extensions/MapKit/Sources/**/*'
187165
ss.exclude_files = 'Extensions/MapKit/Sources/*.plist'
188166
ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'MapKit'
189167
ss.dependency 'PromiseKit/CorePromise'
190-
ss.ios.deployment_target = '8.0'
191-
ss.osx.deployment_target = '10.10'
192-
ss.watchos.deployment_target = '2.0'
193-
ss.tvos.deployment_target = '9.2'
168+
ss.ios.deployment_target = '10.0'
169+
ss.osx.deployment_target = '10.13'
170+
ss.watchos.deployment_target = '4.0'
171+
ss.tvos.deployment_target = '10.0'
194172
end
195173

196174
s.subspec 'MessageUI' do |ss|
197175
ss.ios.source_files = 'Extensions/MessagesUI/Sources/**/*'
198176
ss.exclude_files = 'Extensions/MessagesUI/Sources/*.plist'
199177
ss.ios.frameworks = 'MessageUI'
200178
ss.dependency 'PromiseKit/CorePromise'
201-
ss.ios.deployment_target = '8.0'
202-
end
203-
204-
s.subspec 'OMGHTTPURLRQ' do |ss|
205-
ss.source_files = 'Extensions/OMGHTTPURLRQ/Sources/**/*'
206-
ss.exclude_files = 'Extensions/OMGHTTPURLRQ/Sources/*.plist'
207-
ss.dependency 'PromiseKit/Foundation'
208-
ss.dependency 'OMGHTTPURLRQ', '~> 3.2'
209-
ss.ios.deployment_target = '8.0'
210-
ss.osx.deployment_target = '10.10'
211-
ss.watchos.deployment_target = '2.0'
212-
ss.tvos.deployment_target = '9.0'
179+
ss.ios.deployment_target = '10.0'
213180
end
214181

215182
s.subspec 'Photos' do |ss|
@@ -218,7 +185,7 @@ Pod::Spec.new do |s|
218185
ss.ios.frameworks = ss.tvos.frameworks = ss.osx.frameworks = 'Photos'
219186
ss.dependency 'PromiseKit/CorePromise'
220187

221-
ss.ios.deployment_target = '8.0'
188+
ss.ios.deployment_target = '10.0'
222189
ss.osx.deployment_target = '10.13'
223190
ss.tvos.deployment_target = '10.0'
224191
end
@@ -228,9 +195,9 @@ Pod::Spec.new do |s|
228195
ss.exclude_files = 'Extensions/QuartzCore/Sources/*.plist'
229196
ss.osx.frameworks = ss.ios.frameworks = ss.tvos.frameworks = 'QuartzCore'
230197
ss.dependency 'PromiseKit/CorePromise'
231-
ss.ios.deployment_target = '8.0'
232-
ss.osx.deployment_target = '10.10'
233-
ss.tvos.deployment_target = '9.0'
198+
ss.ios.deployment_target = '10.0'
199+
ss.osx.deployment_target = '10.13'
200+
ss.tvos.deployment_target = '10.0'
234201
end
235202

236203
s.subspec 'Social' do |ss|
@@ -239,28 +206,28 @@ Pod::Spec.new do |s|
239206
ss.osx.source_files = Dir['Extensions/Social/Sources/*'] - ['Categories/Social/Sources/*SLComposeViewController+Promise.swift']
240207
ss.ios.frameworks = ss.osx.frameworks = 'Social'
241208
ss.dependency 'PromiseKit/Foundation'
242-
ss.ios.deployment_target = '8.0'
243-
ss.osx.deployment_target = '10.10'
209+
ss.ios.deployment_target = '10.0'
210+
ss.osx.deployment_target = '10.13'
244211
end
245212

246213
s.subspec 'StoreKit' do |ss|
247214
ss.ios.source_files = ss.osx.source_files = ss.tvos.source_files = 'Extensions/StoreKit/Sources/**/*'
248215
ss.exclude_files = 'Extensions/StoreKit/Sources/*.plist'
249216
ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'StoreKit'
250217
ss.dependency 'PromiseKit/CorePromise'
251-
ss.ios.deployment_target = '8.0'
252-
ss.osx.deployment_target = '10.10'
253-
ss.tvos.deployment_target = '9.0'
218+
ss.ios.deployment_target = '10.0'
219+
ss.osx.deployment_target = '10.13'
220+
ss.tvos.deployment_target = '10.0'
254221
end
255222

256223
s.subspec 'SystemConfiguration' do |ss|
257224
ss.ios.source_files = ss.osx.source_files = ss.tvos.source_files = 'Extensions/SystemConfiguration/Sources/**/*'
258225
ss.exclude_files = 'Extensions/SystemConfiguration/Sources/*.plist'
259226
ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'SystemConfiguration'
260227
ss.dependency 'PromiseKit/CorePromise'
261-
ss.ios.deployment_target = '8.0'
262-
ss.osx.deployment_target = '10.10'
263-
ss.tvos.deployment_target = '9.0'
228+
ss.ios.deployment_target = '10.0'
229+
ss.osx.deployment_target = '10.13'
230+
ss.tvos.deployment_target = '10.0'
264231
end
265232

266233
picker_cc = 'Extensions/UIKit/Sources/UIImagePickerController+Promise.swift'
@@ -270,8 +237,8 @@ Pod::Spec.new do |s|
270237
ss.exclude_files = 'Extensions/UIKit/Sources/*.plist'
271238
ss.tvos.frameworks = ss.ios.frameworks = 'UIKit'
272239
ss.dependency 'PromiseKit/CorePromise'
273-
ss.ios.deployment_target = '8.0'
274-
ss.tvos.deployment_target = '9.0'
240+
ss.ios.deployment_target = '10.0'
241+
ss.tvos.deployment_target = '10.0'
275242
end
276243

277244
s.subspec 'UIImagePickerController' do |ss|
@@ -288,15 +255,15 @@ Pod::Spec.new do |s|
288255
ss.ios.frameworks = 'UIKit'
289256
ss.ios.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) PMKImagePickerController=1' }
290257
ss.dependency 'PromiseKit/UIKit'
291-
ss.ios.deployment_target = '8.0'
258+
ss.ios.deployment_target = '10.0'
292259
end
293260

294261
s.subspec 'WatchConnectivity' do |ss|
295262
ss.ios.source_files = ss.watchos.source_files = 'Extensions/WatchConnectivity/Sources/**/*'
296263
ss.exclude_files = 'Extensions/WatchConnectivity/Sources/*.plist'
297264
ss.ios.frameworks = ss.watchos.frameworks = 'WatchConnectivity'
298265
ss.dependency 'PromiseKit/CorePromise'
299-
ss.ios.deployment_target = '8.0'
300-
ss.watchos.deployment_target = '2.0'
266+
ss.ios.deployment_target = '10.0'
267+
ss.watchos.deployment_target = '4.0'
301268
end
302269
end

‎PromiseKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
085B96BE21A9B37C00E5E22F /* LogEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LogEvent.swift; path = Sources/LogEvent.swift; sourceTree = "<group>"; };
149149
0C42F3191FCF86240051309C /* HangTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HangTests.swift; sourceTree = "<group>"; };
150150
0CC3AF2A1FCF84F7000E98C9 /* hang.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = hang.swift; path = Sources/hang.swift; sourceTree = "<group>"; };
151+
1F1DCDF72A27AB6400E7A16B /* PromiseKit.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = PromiseKit.podspec; sourceTree = "<group>"; };
151152
49A5584B1DC5172F00E4D01B /* ResolverTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResolverTests.swift; sourceTree = "<group>"; };
152153
630019221D596292003B4E30 /* PMKCoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PMKCoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
153154
630A8051203CEF6800D25F23 /* AnyPromiseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnyPromiseTests.m; sourceTree = "<group>"; };
@@ -182,7 +183,6 @@
182183
635893921D5BE4E000F14B55 /* PromiseKit.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = PromiseKit.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
183184
635893941D5BE4F900F14B55 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
184185
635893951D5BE4F900F14B55 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
185-
635893961D5BE4F900F14B55 /* PromiseKit.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = PromiseKit.podspec; path = .github/PromiseKit.podspec; sourceTree = "<group>"; };
186186
635893971D5BE4F900F14B55 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
187187
635D64081D59635300BC0AF5 /* PromiseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PromiseTests.swift; sourceTree = "<group>"; };
188188
635D64091D59635300BC0AF5 /* CancellableErrorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CancellableErrorTests.swift; sourceTree = "<group>"; };
@@ -397,7 +397,7 @@
397397
63B0AC6C1D595E6300FA21D9 /* Info.plist */,
398398
635893941D5BE4F900F14B55 /* LICENSE */,
399399
635893951D5BE4F900F14B55 /* Package.swift */,
400-
635893961D5BE4F900F14B55 /* PromiseKit.podspec */,
400+
1F1DCDF72A27AB6400E7A16B /* PromiseKit.podspec */,
401401
);
402402
name = "…";
403403
sourceTree = "<group>";
@@ -946,7 +946,7 @@
946946
CLANG_WARN_UNREACHABLE_CODE = YES;
947947
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
948948
COPY_PHASE_STRIP = NO;
949-
CURRENT_PROJECT_VERSION = 6.22.1;
949+
CURRENT_PROJECT_VERSION = 6.23.0;
950950
DEBUG_INFORMATION_FORMAT = dwarf;
951951
DYLIB_COMPATIBILITY_VERSION = 1;
952952
DYLIB_CURRENT_VERSION = 1;
@@ -1008,7 +1008,7 @@
10081008
CLANG_WARN_UNREACHABLE_CODE = YES;
10091009
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10101010
COPY_PHASE_STRIP = NO;
1011-
CURRENT_PROJECT_VERSION = 6.22.1;
1011+
CURRENT_PROJECT_VERSION = 6.23.0;
10121012
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10131013
DYLIB_COMPATIBILITY_VERSION = 1;
10141014
DYLIB_CURRENT_VERSION = 1;

‎Tests/Bridging/Infrastructure.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
@import PromiseKit;
33
#import "Infrastructure.h"
44

5-
AnyPromise *PMKDummyAnyPromise_YES() {
5+
AnyPromise *PMKDummyAnyPromise_YES(void) {
66
return [AnyPromise promiseWithValue:@YES];
77
}
88

9-
AnyPromise *PMKDummyAnyPromise_Manifold() {
9+
AnyPromise *PMKDummyAnyPromise_Manifold(void) {
1010
return [AnyPromise promiseWithValue:PMKManifold(@YES, @NO, @NO)];
1111
}
1212

13-
AnyPromise *PMKDummyAnyPromise_Error() {
13+
AnyPromise *PMKDummyAnyPromise_Error(void) {
1414
return [AnyPromise promiseWithValue:[NSError errorWithDomain:@"a" code:1 userInfo:nil]];
1515
}
1616

@@ -28,7 +28,7 @@ - (AnyPromise *)bridge2 {
2828

2929
#import "PMKBridgeTests-Swift.h"
3030

31-
AnyPromise *testCase626() {
31+
AnyPromise *testCase626(void) {
3232
return PMKWhen(@[[TestPromise626 promise], [TestPromise626 promise]]).then(^(id value){
3333
NSLog(@"Success: %@", value);
3434
}).catch(^(NSError *error) {

0 commit comments

Comments
 (0)