Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Xcode 11 warnings. Use angled brackets for framework headers #198

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Xcode 11 warnings. Use angled brackets for framework headers #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion Expecta.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -1216,7 +1216,7 @@
attributes = {
CLASSPREFIX = EXP;
LastTestingUpgradeCheck = 0630;
LastUpgradeCheck = 1010;
LastUpgradeCheck = 1250;
ORGANIZATIONNAME = "Peter Jihoon Kim";
TargetAttributes = {
908379101A8B9660009844DA = {
Expand All @@ -1232,6 +1232,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = E9ACDF0113B2DD520010F4D7;
Expand Down Expand Up @@ -1992,6 +1993,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -2191,6 +2193,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -2238,6 +2241,7 @@
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
24 changes: 10 additions & 14 deletions Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "908379101A8B9660009844DA"
BuildableName = "Expecta.framework"
BlueprintName = "Expecta-iOS"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "908379101A8B9660009844DA"
BuildableName = "Expecta.framework"
BlueprintName = "Expecta-iOS"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
24 changes: 10 additions & 14 deletions Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "908379781A8B972C009844DA"
BuildableName = "Expecta.framework"
BlueprintName = "Expecta"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "908379781A8B972C009844DA"
BuildableName = "Expecta.framework"
BlueprintName = "Expecta"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
6 changes: 1 addition & 5 deletions Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -39,8 +39,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
24 changes: 10 additions & 14 deletions Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
LastUpgradeVersion = "1250"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
BuildableName = "libExpecta.a"
BlueprintName = "libExpecta"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
BuildableName = "libExpecta.a"
BlueprintName = "libExpecta"
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -84,8 +82,6 @@
ReferencedContainer = "container:Expecta.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
4 changes: 2 additions & 2 deletions Expecta/EXPBlockDefinedMatcher.h
View file
Open in desktop
Expand Up @@ -7,8 +7,8 @@
//

#import <Foundation/Foundation.h>
#import "EXPMatcher.h"
#import "EXPDefines.h"
#import <Expecta/EXPMatcher.h>
#import <Expecta/EXPDefines.h>

@interface EXPBlockDefinedMatcher : NSObject <EXPMatcher> {
EXPBoolBlock prerequisiteBlock;
Expand Down
4 changes: 2 additions & 2 deletions Expecta/EXPExpect.h
View file
Open in desktop
@@ -1,6 +1,6 @@
#import <Foundation/Foundation.h>
#import "EXPMatcher.h"
#import "EXPDefines.h"
#import <Expecta/EXPMatcher.h>
#import <Expecta/EXPDefines.h>

@interface EXPExpect : NSObject {
EXPIdBlock _actualBlock;
Expand Down
4 changes: 2 additions & 2 deletions Expecta/ExpectaSupport.h
View file
Open in desktop
@@ -1,5 +1,5 @@
#import "EXPExpect.h"
#import "EXPBlockDefinedMatcher.h"
#import <Expecta/EXPExpect.h>
#import <Expecta/EXPBlockDefinedMatcher.h>

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beCloseTo.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beCloseToWithin, (id expected, id within));
EXPMatcherInterface(beCloseToWithin, (id expected, id within));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beFalsy.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beFalsy, (void));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beGreaterThan.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beGreaterThan, (id expected));
EXPMatcherInterface(beGreaterThan, (id expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beGreaterThanOrEqualTo, (id expected));
EXPMatcherInterface(beGreaterThanOrEqualTo, (id expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beIdenticalTo.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beIdenticalTo, (void *expected));
EXPMatcherInterface(beIdenticalTo, (void *expected)); // to aid code completion
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beInTheRangeOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beInTheRangeOf, (id expectedLowerBound, id expectedUpperBound));
EXPMatcherInterface(beInTheRangeOf, (id expectedLowerBound, id expectedUpperBound));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beInstanceOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beInstanceOf, (Class expected));
EXPMatcherInterface(beAnInstanceOf, (Class expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beKindOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beKindOf, (Class expected));
EXPMatcherInterface(beAKindOf, (Class expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beLessThan.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beLessThan, (id expected));
EXPMatcherInterface(beLessThan, (id expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_beLessThanOrEqualTo, (id expected));
EXPMatcherInterface(beLessThanOrEqualTo, (id expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beNil.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beNil, (void));
EXPMatcherInterface(beNull, (void));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beSubclassOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beSubclassOf, (Class expected));
EXPMatcherInterface(beASubclassOf, (Class expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beSupersetOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beSupersetOf, (id subset));

2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beTruthy.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beTruthy, (void));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+beginWith.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(beginWith, (id expected));
EXPMatcherInterface(startWith, (id expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+conformTo.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(conformTo, (Protocol *expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+contain.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_contain, (id expected));
EXPMatcherInterface(contain, (id expected)); // to aid code completion
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+endWith.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(endWith, (id expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+equal.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(_equal, (id expected));
EXPMatcherInterface(equal, (id expected)); // to aid code completion
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+haveCountOf.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(haveCountOf, (NSUInteger expected));
EXPMatcherInterface(haveCount, (NSUInteger expected));
Expand Down
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+match.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(match, (NSString *expected));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+postNotification.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(postNotification, (id expectedNotification));
EXPMatcherInterface(notify, (id expectedNotification));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+raise.h
View file
Open in desktop
@@ -1,4 +1,4 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(raise, (NSString *expectedExceptionName));
#define raiseAny() raise(nil)
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+raiseWithReason.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(raiseWithReason, (NSString *expectedExceptionName, NSString *expectedReason));
2 changes: 1 addition & 1 deletion Expecta/Matchers/EXPMatchers+respondTo.h
View file
Open in desktop
@@ -1,3 +1,3 @@
#import "Expecta.h"
#import <Expecta/Expecta.h>

EXPMatcherInterface(respondTo, (SEL expected));