Skip to content

Commit bb9f9c5

Browse files
PaulTaykaloPaulTaykalo
committed
Fix Xcode 11 warnings. Use angled brackets for framework headers
1 parent fc2dd8b commit bb9f9c5

35 files changed

+93
-105
lines changed

‎Expecta.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@
12161216
attributes = {
12171217
CLASSPREFIX = EXP;
12181218
LastTestingUpgradeCheck = 0630;
1219-
LastUpgradeCheck = 1010;
1219+
LastUpgradeCheck = 1250;
12201220
ORGANIZATIONNAME = "Peter Jihoon Kim";
12211221
TargetAttributes = {
12221222
908379101A8B9660009844DA = {
@@ -1232,6 +1232,7 @@
12321232
developmentRegion = English;
12331233
hasScannedForEncodings = 0;
12341234
knownRegions = (
1235+
English,
12351236
en,
12361237
);
12371238
mainGroup = E9ACDF0113B2DD520010F4D7;
@@ -1992,6 +1993,7 @@
19921993
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
19931994
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
19941995
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1996+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
19951997
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
19961998
CLANG_WARN_STRICT_PROTOTYPES = YES;
19971999
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2191,6 +2193,7 @@
21912193
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
21922194
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
21932195
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2196+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
21942197
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
21952198
CLANG_WARN_STRICT_PROTOTYPES = YES;
21962199
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2238,6 +2241,7 @@
22382241
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
22392242
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
22402243
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2244+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
22412245
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
22422246
CLANG_WARN_STRICT_PROTOTYPES = YES;
22432247
CLANG_WARN_SUSPICIOUS_MOVE = YES;

‎Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "908379101A8B9660009844DA"
34+
BuildableName = "Expecta.framework"
35+
BlueprintName = "Expecta-iOS"
36+
ReferencedContainer = "container:Expecta.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "908379101A8B9660009844DA"
46-
BuildableName = "Expecta.framework"
47-
BlueprintName = "Expecta-iOS"
48-
ReferencedContainer = "container:Expecta.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Expecta.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<MacroExpansion>
31+
<BuildableReference
32+
BuildableIdentifier = "primary"
33+
BlueprintIdentifier = "908379781A8B972C009844DA"
34+
BuildableName = "Expecta.framework"
35+
BlueprintName = "Expecta"
36+
ReferencedContainer = "container:Expecta.xcodeproj">
37+
</BuildableReference>
38+
</MacroExpansion>
3039
<Testables>
3140
<TestableReference
3241
skipped = "NO">
@@ -39,17 +48,6 @@
3948
</BuildableReference>
4049
</TestableReference>
4150
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "908379781A8B972C009844DA"
46-
BuildableName = "Expecta.framework"
47-
BlueprintName = "Expecta"
48-
ReferencedContainer = "container:Expecta.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5351
</TestAction>
5452
<LaunchAction
5553
buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
7068
ReferencedContainer = "container:Expecta.xcodeproj">
7169
</BuildableReference>
7270
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7571
</LaunchAction>
7672
<ProfileAction
7773
buildConfiguration = "Release"

‎Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -39,8 +39,6 @@
3939
</BuildableReference>
4040
</TestableReference>
4141
</Testables>
42-
<AdditionalOptions>
43-
</AdditionalOptions>
4442
</TestAction>
4543
<LaunchAction
4644
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:Expecta.xcodeproj">
6260
</BuildableReference>
6361
</MacroExpansion>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1010"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
48+
BuildableName = "libExpecta.a"
49+
BlueprintName = "libExpecta"
50+
ReferencedContainer = "container:Expecta.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
60-
BuildableName = "libExpecta.a"
61-
BlueprintName = "libExpecta"
62-
ReferencedContainer = "container:Expecta.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:Expecta.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

‎Expecta/EXPBlockDefinedMatcher.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import "EXPMatcher.h"
11-
#import "EXPDefines.h"
10+
#import <Expecta/EXPMatcher.h>
11+
#import <Expecta/EXPDefines.h>
1212

1313
@interface EXPBlockDefinedMatcher : NSObject <EXPMatcher> {
1414
EXPBoolBlock prerequisiteBlock;

‎Expecta/EXPExpect.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
2-
#import "EXPMatcher.h"
3-
#import "EXPDefines.h"
2+
#import <Expecta/EXPMatcher.h>
3+
#import <Expecta/EXPDefines.h>
44

55
@interface EXPExpect : NSObject {
66
EXPIdBlock _actualBlock;

‎Expecta/ExpectaSupport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#import "EXPExpect.h"
2-
#import "EXPBlockDefinedMatcher.h"
1+
#import <Expecta/EXPExpect.h>
2+
#import <Expecta/EXPBlockDefinedMatcher.h>
33

44
#ifdef __cplusplus
55
extern "C" {

‎Expecta/Matchers/EXPMatchers+beCloseTo.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#import "Expecta.h"
1+
#import <Expecta/Expecta.h>
22

33
EXPMatcherInterface(_beCloseToWithin, (id expected, id within));
44
EXPMatcherInterface(beCloseToWithin, (id expected, id within));

‎Expecta/Matchers/EXPMatchers+beFalsy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#import "Expecta.h"
1+
#import <Expecta/Expecta.h>
22

33
EXPMatcherInterface(beFalsy, (void));

0 commit comments

Comments
 (0)