diff --git a/MBDebugPanel.xcworkspace/contents.xcworkspacedata b/MBDebugPanel.xcworkspace/contents.xcworkspacedata index c5552d2..6bbf91c 100644 --- a/MBDebugPanel.xcworkspace/contents.xcworkspacedata +++ b/MBDebugPanel.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,9 @@ + location = "group:MBDebugPanel/MBDebugPanel.xcodeproj"> + location = "group:MBDebugPanelDemo/MBDebugPanelDemo.xcodeproj"> diff --git a/MBDebugPanel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MBDebugPanel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/MBDebugPanel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj b/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj index 3c69631..398cde6 100644 --- a/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj +++ b/MBDebugPanel/MBDebugPanel.xcodeproj/project.pbxproj @@ -19,19 +19,14 @@ 9A5DE2C51EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A5DE29D1EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponentCell.xib */; }; 9A5DE2C61EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A5DE29D1EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponentCell.xib */; }; 9A5DE2CA1EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2A11EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9A5DE2CE1EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A21EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m */; }; 9A5DE2CF1EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A21EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m */; }; 9A5DE2D31EA55DC500C90F62 /* MBDebugPanelSimpleComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2A31EA55DC500C90F62 /* MBDebugPanelSimpleComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9A5DE2D71EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A41EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m */; }; 9A5DE2D81EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A41EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m */; }; 9A5DE2DC1EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2A51EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9A5DE2E01EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A61EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m */; }; 9A5DE2E11EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A61EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m */; }; 9A5DE2E51EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2A71EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9A5DE2E91EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A81EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m */; }; 9A5DE2EA1EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2A81EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m */; }; 9A5DE2EE1EA55DC500C90F62 /* MBDebugPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2A91EA55DC500C90F62 /* MBDebugPanel.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9A5DE2F21EA55DC500C90F62 /* MBDebugPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2AA1EA55DC500C90F62 /* MBDebugPanel.m */; }; 9A5DE2F31EA55DC500C90F62 /* MBDebugPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5DE2AA1EA55DC500C90F62 /* MBDebugPanel.m */; }; 9A5DE2F71EA55DC500C90F62 /* MBDebugPanelComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2AB1EA55DC500C90F62 /* MBDebugPanelComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A5DE2FB1EA55DC500C90F62 /* MBDebugPanel_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A5DE2AD1EA55DC500C90F62 /* MBDebugPanel_Private.h */; }; @@ -189,18 +184,10 @@ 9A10FA3C1EA5633500D2B095 /* MBAppDelegate.m */, 9A10FA3D1EA5633500D2B095 /* MBDebugPanelTestsApplicationContainer-Info.plist */, 9A10FA3E1EA5633500D2B095 /* MBDebugPanelTestsApplicationContainer-Prefix.pch */, - 9A10FA3F1EA5633500D2B095 /* Supporting Files */, ); path = MBDebugPanelTestsApplicationContainer; sourceTree = ""; }; - 9A10FA3F1EA5633500D2B095 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - path = "Supporting Files"; - sourceTree = ""; - }; 9A5DE2981EA55DC500C90F62 /* Sources */ = { isa = PBXGroup; children = ( @@ -448,7 +435,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1010; TargetAttributes = { 9AB6E68A1EA5574F002DB509 = { CreatedOnToolsVersion = 8.3.1; @@ -482,10 +469,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - FDCFACEE18A49E9200E4AD74 /* MBDebugPanelTests */, - FD3CB35B18AC656F00FD9427 /* MBDebugPanelTestsApplicationContainer */, 9AB6E68A1EA5574F002DB509 /* MBDebugPanel iOS */, 9AB6E6921EA5574F002DB509 /* MBDebugPanel iOSTests */, + FDCFACEE18A49E9200E4AD74 /* MBDebugPanelTests */, + FD3CB35B18AC656F00FD9427 /* MBDebugPanelTestsApplicationContainer */, ); }; /* End PBXProject section */ @@ -564,13 +551,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9A5DE2F21EA55DC500C90F62 /* MBDebugPanel.m in Sources */, - 9A5DE2E01EA55DC500C90F62 /* MBDebugPanelSimpleSwitchComponent.m in Sources */, 9A10FA431EA5633500D2B095 /* MBAppDelegate.m in Sources */, - 9A5DE2E91EA55DC500C90F62 /* MBDebugPanelSimpleTextFieldComponent.m in Sources */, - 9A5DE2CE1EA55DC500C90F62 /* MBDebugPanelSimpleButtonComponent.m in Sources */, 9A10FA421EA5633500D2B095 /* main.m in Sources */, - 9A5DE2D71EA55DC500C90F62 /* MBDebugPanelSimpleComponent.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -792,7 +774,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "MBDebugPanel iOSTests/Info.plist"; + INFOPLIST_FILE = "Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; @@ -842,7 +824,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "MBDebugPanel iOSTests/Info.plist"; + INFOPLIST_FILE = "Tests/MBDebugPanelTests/Supporting Files/Info-Tests-iOS.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; @@ -959,18 +941,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -986,17 +977,26 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1035,7 +1035,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MBDebugPanelTests/MBDebugPanelTests-Prefix.pch"; + GCC_PREFIX_HEADER = "Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1047,7 +1047,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "MBDebugPanelTests/MBDebugPanelTests-Info.plist"; + INFOPLIST_FILE = "Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1085,14 +1085,14 @@ ); GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MBDebugPanelTests/MBDebugPanelTests-Prefix.pch"; + GCC_PREFIX_HEADER = "Tests/MBDebugPanelTests/MBDebugPanelTests-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "MBDebugPanelTests/MBDebugPanelTests-Info.plist"; + INFOPLIST_FILE = "Tests/MBDebugPanelTests/MBDebugPanelTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme b/MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme index 3934618..7cbe7c5 100644 --- a/MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme +++ b/MBDebugPanel/MBDebugPanel.xcodeproj/xcshareddata/xcschemes/MBDebugPanel iOS.xcscheme @@ -1,6 +1,6 @@ + + + + + + + + + + + + diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m index c77b08c..16d21a8 100644 --- a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m +++ b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleButtonComponent.m @@ -37,6 +37,7 @@ @interface MBDebugPanelSimpleButtonComponentCell : UITableViewCell @implementation MBDebugPanelSimpleButtonComponentCell -(void)prepareForReuse { + [super prepareForReuse]; [self.button removeTarget:nil action:NULL forControlEvents:UIControlEventTouchUpInside]; diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m index d1db122..805b949 100644 --- a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m +++ b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleSwitchComponent.m @@ -38,6 +38,7 @@ @interface MBDebugPanelSimpleSwitchComponentCell : UITableViewCell @implementation MBDebugPanelSimpleSwitchComponentCell -(void)prepareForReuse { + [super prepareForReuse]; [self.theSwitch removeTarget:nil action:NULL forControlEvents:UIControlEventValueChanged]; diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h index 5b606e4..5b05f54 100644 --- a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h +++ b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.h @@ -11,7 +11,7 @@ @interface MBDebugPanelSimpleTextFieldComponent : MBDebugPanelSimpleComponent @property (nonatomic, copy, readonly) NSString *title; @property (nonatomic, copy, readonly) NSString *placeholderText; -@property (nonatomic, copy, readonly) NSString *(^initialText)(); +@property (nonatomic, copy, readonly) NSString *(^initialText)(void); @property (nonatomic, copy, readonly) void(^onEditingDidEnd)(NSString *text); /** Create a new text field component diff --git a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m index ca3526f..d93bc99 100644 --- a/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m +++ b/MBDebugPanel/Sources/Classes/ios/components/MBDebugPanelSimpleTextFieldComponent.m @@ -17,6 +17,7 @@ @interface MBDebugPanelSimpleTextFieldComponentCell : UITableViewCell @implementation MBDebugPanelSimpleTextFieldComponentCell -(void)prepareForReuse { + [super prepareForReuse]; self.textField.delegate = nil; } @end @@ -24,7 +25,7 @@ -(void)prepareForReuse @interface MBDebugPanelSimpleTextFieldComponent() @property (nonatomic, copy, readwrite) NSString *title; @property (nonatomic, copy, readwrite) NSString *placeholderText; -@property (nonatomic, copy, readwrite) NSString *(^initialText)(); +@property (nonatomic, copy, readwrite) NSString *(^initialText)(void); @property (nonatomic, copy, readwrite) void(^onEditingDidEnd)(NSString *text); @end diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m b/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m index 5c3f622..a7b5511 100644 --- a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m +++ b/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelSimpleComponentTests.m @@ -73,8 +73,8 @@ - (void)testRegistersForCellReuse // Get all the cell instances in the table NSMutableSet *cellInstances = [NSMutableSet setWithArray:[tableView visibleCells]]; - int cellsBeforeReloading = [cellInstances count]; - int cellsAfterReloading; + NSUInteger cellsBeforeReloading = [cellInstances count]; + NSUInteger cellsAfterReloading; // Reload the table [tableView reloadData]; @@ -84,7 +84,7 @@ - (void)testRegistersForCellReuse cellsAfterReloading = [cellInstances count]; // Object count should remain the same (cells should be reused) - XCTAssertEqualWithAccuracy(cellsAfterReloading, cellsBeforeReloading, 1, @"No more than 1 extra cell instance should have been created. (Had %d before scrolling, and %d after scrolling)", cellsBeforeReloading, cellsAfterReloading); + XCTAssertEqualWithAccuracy(cellsAfterReloading, cellsBeforeReloading, 1, @"No more than 1 extra cell instance should have been created. (Had %lul before scrolling, and %lul after scrolling)", cellsBeforeReloading, cellsAfterReloading); } diff --git a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m b/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m index 26726a8..367b6c2 100644 --- a/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m +++ b/MBDebugPanel/Tests/MBDebugPanelTests/MBDebugPanelTests.m @@ -59,7 +59,8 @@ static void(^dummySwitchHanlder)(void) = ^{ -(id)makeSwitch { return [[MBDebugPanelSimpleSwitchComponent alloc] initWithTitle:@"switch" - onSwitchChanged:nil]; + initialValue:true + onSwitchChanged:nil]; } #pragma mark tests @@ -100,7 +101,7 @@ -(void)testCanRemoveAComponent -(void)testOnlyOneSectionSupported /*right now*/ { id panel = [MBDebugPanel sharedPanel_]; - XCTAssert([panel numberOfSectionsInTableView:nil] == 1, @"Number of sections is hard-coded to 1."); + XCTAssert([panel numberOfSectionsInTableView:[UITableView new]] == 1, @"Number of sections is hard-coded to 1."); } -(void)testTableRowCountIsSameAsComponentCount @@ -110,7 +111,7 @@ -(void)testTableRowCountIsSameAsComponentCount [MBDebugPanel addComponent:[self makeButton]]; id panel = [MBDebugPanel sharedPanel_]; - XCTAssert([panel tableView:nil numberOfRowsInSection:0] == kCount, @"Row count should be equal to number of components"); + XCTAssert([panel tableView:[UITableView new] numberOfRowsInSection:0] == kCount, @"Row count should be equal to number of components"); } -(void)testReloadsTableDataWhenShown @@ -131,8 +132,8 @@ -(void)testReloadsTableDataWhenShown // We're expecting that -[UITableView reloadData] should have been called during the 'show' method UITableViewCell *cell2 = [MBDebugPanel.sharedPanel_.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]]; - int tableRowCount = [MBDebugPanel.sharedPanel_.tableView numberOfRowsInSection:0]; - XCTAssert(tableRowCount == 1, @"There should only be 1 row displayed in the table, instead saw %d", tableRowCount); + NSInteger tableRowCount = [MBDebugPanel.sharedPanel_.tableView numberOfRowsInSection:0]; + XCTAssert(tableRowCount == 1, @"There should only be 1 row displayed in the table, instead saw %ld", (long)tableRowCount); XCTAssert(cell1 != cell2, @"The displayed cell should be re-rendered and now of a different type, since it was from a different component. Renderered cell was instance of %@", NSStringFromClass(cell2.class)); } diff --git a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json index b8236c6..19882d5 100644 --- a/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/MBDebugPanel/Tests/MBDebugPanelTestsApplicationContainer/Images.xcassets/AppIcon.appiconset/Contents.json @@ -39,6 +39,11 @@ "idiom" : "iphone", "size" : "60x60", "scale" : "3x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/MBDebugPanelDemo/MBDebugPanelDemo.xcodeproj/project.pbxproj b/MBDebugPanelDemo/MBDebugPanelDemo.xcodeproj/project.pbxproj index 25ec194..2ed4df4 100644 --- a/MBDebugPanelDemo/MBDebugPanelDemo.xcodeproj/project.pbxproj +++ b/MBDebugPanelDemo/MBDebugPanelDemo.xcodeproj/project.pbxproj @@ -220,7 +220,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MB; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = MINDBODY; TargetAttributes = { FDCFAD1418A49F5800E4AD74 = { @@ -373,14 +373,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -417,14 +425,22 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;