Skip to content

Commit 92725f7

Browse files
author
Luc Dion
committed
Fix macOS build CI
1 parent a7dcfb5 commit 92725f7

File tree

7 files changed

+62
-10
lines changed

7 files changed

+62
-10
lines changed

‎Sources/ObjectiveC/PinLayoutObjC.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ import AppKit
3030
feature not available to objective-c, including overloading.
3131
*/
3232
@objc public protocol PinLayoutObjC {
33+
#if os(iOS) || os(tvOS)
3334
var safeArea: PEdgeInsets { get }
35+
#endif
3436

3537
/**
3638
With the Objective-C interface, you must call the \"layout\" method to ensure the view is layouted correctly.

‎Sources/ObjectiveC/PinLayoutObjCImpl.swift‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,13 @@ import AppKit
5353
#endif
5454

5555
private var impl: PinLayout<PView>?
56-
56+
57+
#if os(iOS) || os(tvOS)
58+
var safeArea: PEdgeInsets {
59+
return impl?.safeArea ?? .zero
60+
}
61+
#endif
62+
5763
init(view: PView, keepTransform: Bool) {
5864
impl = PinLayout<PView>(view: view, keepTransform: keepTransform)
5965
}
@@ -64,10 +70,6 @@ import AppKit
6470
}
6571
}
6672

67-
var safeArea: PEdgeInsets {
68-
return impl?.safeArea ?? .zero
69-
}
70-
7173
func layout() {
7274
// With objective-c PinLayoutObjCImpl instance are sometimes deallocated only after the context has been quit. For this reason
7375
// developpers must call the layout: method implicetely.

‎TestProjects/cocoapods/ios/PinLayout-iOS.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
isa = PBXProject;
123123
attributes = {
124124
LastSwiftUpdateCheck = 0830;
125-
LastUpgradeCheck = 0830;
125+
LastUpgradeCheck = 0940;
126126
ORGANIZATIONNAME = LayoutBox;
127127
TargetAttributes = {
128128
24C872DC1EE2CE0B007BFE47 = {
@@ -247,15 +247,23 @@
247247
CLANG_CXX_LIBRARY = "libc++";
248248
CLANG_ENABLE_MODULES = YES;
249249
CLANG_ENABLE_OBJC_ARC = YES;
250+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
250251
CLANG_WARN_BOOL_CONVERSION = YES;
252+
CLANG_WARN_COMMA = YES;
251253
CLANG_WARN_CONSTANT_CONVERSION = YES;
254+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
252255
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
253256
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
254257
CLANG_WARN_EMPTY_BODY = YES;
255258
CLANG_WARN_ENUM_CONVERSION = YES;
256259
CLANG_WARN_INFINITE_RECURSION = YES;
257260
CLANG_WARN_INT_CONVERSION = YES;
261+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
262+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
263+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
258264
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
265+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
266+
CLANG_WARN_STRICT_PROTOTYPES = YES;
259267
CLANG_WARN_SUSPICIOUS_MOVE = YES;
260268
CLANG_WARN_UNREACHABLE_CODE = YES;
261269
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -298,15 +306,23 @@
298306
CLANG_CXX_LIBRARY = "libc++";
299307
CLANG_ENABLE_MODULES = YES;
300308
CLANG_ENABLE_OBJC_ARC = YES;
309+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
301310
CLANG_WARN_BOOL_CONVERSION = YES;
311+
CLANG_WARN_COMMA = YES;
302312
CLANG_WARN_CONSTANT_CONVERSION = YES;
313+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
303314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
304315
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
305316
CLANG_WARN_EMPTY_BODY = YES;
306317
CLANG_WARN_ENUM_CONVERSION = YES;
307318
CLANG_WARN_INFINITE_RECURSION = YES;
308319
CLANG_WARN_INT_CONVERSION = YES;
320+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
321+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
322+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
309323
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
324+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
325+
CLANG_WARN_STRICT_PROTOTYPES = YES;
310326
CLANG_WARN_SUSPICIOUS_MOVE = YES;
311327
CLANG_WARN_UNREACHABLE_CODE = YES;
312328
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎TestProjects/cocoapods/macos/PinLayout-macOS.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
isa = PBXProject;
117117
attributes = {
118118
LastSwiftUpdateCheck = 0830;
119-
LastUpgradeCheck = 0830;
119+
LastUpgradeCheck = 0940;
120120
ORGANIZATIONNAME = Linkedin;
121121
TargetAttributes = {
122122
447D4B4E1EA571EC002FDFF4 = {
@@ -218,15 +218,23 @@
218218
CLANG_CXX_LIBRARY = "libc++";
219219
CLANG_ENABLE_MODULES = YES;
220220
CLANG_ENABLE_OBJC_ARC = YES;
221+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
221222
CLANG_WARN_BOOL_CONVERSION = YES;
223+
CLANG_WARN_COMMA = YES;
222224
CLANG_WARN_CONSTANT_CONVERSION = YES;
225+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
223226
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
224227
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
225228
CLANG_WARN_EMPTY_BODY = YES;
226229
CLANG_WARN_ENUM_CONVERSION = YES;
227230
CLANG_WARN_INFINITE_RECURSION = YES;
228231
CLANG_WARN_INT_CONVERSION = YES;
232+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
233+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
234+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
229235
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
236+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
237+
CLANG_WARN_STRICT_PROTOTYPES = YES;
230238
CLANG_WARN_SUSPICIOUS_MOVE = YES;
231239
CLANG_WARN_UNREACHABLE_CODE = YES;
232240
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -268,15 +276,23 @@
268276
CLANG_CXX_LIBRARY = "libc++";
269277
CLANG_ENABLE_MODULES = YES;
270278
CLANG_ENABLE_OBJC_ARC = YES;
279+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
271280
CLANG_WARN_BOOL_CONVERSION = YES;
281+
CLANG_WARN_COMMA = YES;
272282
CLANG_WARN_CONSTANT_CONVERSION = YES;
283+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
273284
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
274285
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
275286
CLANG_WARN_EMPTY_BODY = YES;
276287
CLANG_WARN_ENUM_CONVERSION = YES;
277288
CLANG_WARN_INFINITE_RECURSION = YES;
278289
CLANG_WARN_INT_CONVERSION = YES;
290+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
291+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
292+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
279293
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
294+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
295+
CLANG_WARN_STRICT_PROTOTYPES = YES;
280296
CLANG_WARN_SUSPICIOUS_MOVE = YES;
281297
CLANG_WARN_UNREACHABLE_CODE = YES;
282298
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎TestProjects/cocoapods/macos/PinLayout-macOS.xcodeproj/xcshareddata/xcschemes/PinLayout-macOS.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 = "0830"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎TestProjects/cocoapods/tvos/PinLayout-tvOS.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
isa = PBXProject;
116116
attributes = {
117117
LastSwiftUpdateCheck = 0830;
118-
LastUpgradeCheck = 0830;
118+
LastUpgradeCheck = 0940;
119119
ORGANIZATIONNAME = Linkedin;
120120
TargetAttributes = {
121121
448160321EA5A76A00FBA809 = {
@@ -199,15 +199,23 @@
199199
CLANG_CXX_LIBRARY = "libc++";
200200
CLANG_ENABLE_MODULES = YES;
201201
CLANG_ENABLE_OBJC_ARC = YES;
202+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
202203
CLANG_WARN_BOOL_CONVERSION = YES;
204+
CLANG_WARN_COMMA = YES;
203205
CLANG_WARN_CONSTANT_CONVERSION = YES;
206+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
204207
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
205208
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
206209
CLANG_WARN_EMPTY_BODY = YES;
207210
CLANG_WARN_ENUM_CONVERSION = YES;
208211
CLANG_WARN_INFINITE_RECURSION = YES;
209212
CLANG_WARN_INT_CONVERSION = YES;
213+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
214+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
215+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
210216
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
217+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
218+
CLANG_WARN_STRICT_PROTOTYPES = YES;
211219
CLANG_WARN_SUSPICIOUS_MOVE = YES;
212220
CLANG_WARN_UNREACHABLE_CODE = YES;
213221
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -249,15 +257,23 @@
249257
CLANG_CXX_LIBRARY = "libc++";
250258
CLANG_ENABLE_MODULES = YES;
251259
CLANG_ENABLE_OBJC_ARC = YES;
260+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
252261
CLANG_WARN_BOOL_CONVERSION = YES;
262+
CLANG_WARN_COMMA = YES;
253263
CLANG_WARN_CONSTANT_CONVERSION = YES;
264+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
254265
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
255266
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
256267
CLANG_WARN_EMPTY_BODY = YES;
257268
CLANG_WARN_ENUM_CONVERSION = YES;
258269
CLANG_WARN_INFINITE_RECURSION = YES;
259270
CLANG_WARN_INT_CONVERSION = YES;
271+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
272+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
273+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
260274
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
275+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
276+
CLANG_WARN_STRICT_PROTOTYPES = YES;
261277
CLANG_WARN_SUSPICIOUS_MOVE = YES;
262278
CLANG_WARN_UNREACHABLE_CODE = YES;
263279
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎TestProjects/cocoapods/tvos/PinLayout-tvOS.xcodeproj/xcshareddata/xcschemes/PinLayout-tvOS.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 = "0830"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)