Skip to content

Commit a1ccae1

Browse files
chbeerchbeer
authored
Merge pull request #1 from gitx/Ci-and-Improvements-to-upstream
CI and improvements
2 parents a36e6c3 + 627588c commit a1ccae1

File tree

10 files changed

+125
-34
lines changed

10 files changed

+125
-34
lines changed

‎.github/workflows/BuildPR.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: build-mgscopebar
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
buildGitx:
7+
name: Build MGScopeBar
8+
runs-on: macOS-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2.3.4
12+
with:
13+
fetch-depth: 0
14+
submodules: true
15+
- name: Set XCode Version
16+
run: sudo xcode-select -s /Applications/Xcode_12.2.app
17+
- name: Build project
18+
run: set -o pipefail && xcodebuild -workspace MGScopeBar.xcodeproj/project.xcworkspace -scheme MGScopeBar archive | xcpretty
19+

‎AppController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ - (void)dealloc
118118
#pragma mark MGScopeBarDelegate methods
119119

120120

121-
- (int)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar
121+
- (NSInteger)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar
122122
{
123123
return [self.groups count];
124124
}
@@ -197,10 +197,10 @@ - (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected
197197
forItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
198198
{
199199
// Display some text showing what just happened.
200-
NSString *displayString = [NSString stringWithFormat:@"\"%@\" %@ in group %d.",
200+
NSString *displayString = [NSString stringWithFormat:@"\"%@\" %@ in group %@.",
201201
[self scopeBar:theScopeBar titleOfItem:identifier inGroup:groupNumber],
202202
(selected) ? @"selected" : @"deselected",
203-
groupNumber];
203+
@(groupNumber)];
204204
[labelField setStringValue:displayString];
205205
//NSLog(@"%@", displayString);
206206
}

‎English.lproj/MainMenu.xib‎ renamed to ‎Base.lproj/MainMenu.xib‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
6+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
67
</dependencies>
78
<objects>
89
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
@@ -516,30 +517,29 @@
516517
</menu>
517518
</menuItem>
518519
</items>
520+
<point key="canvasLocation" x="139" y="154"/>
519521
</menu>
520522
<window title="MGScopeBar Demo" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
521523
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
522524
<windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
523525
<rect key="contentRect" x="153" y="619" width="805" height="122"/>
524-
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
526+
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
525527
<value key="minSize" type="size" width="250" height="122"/>
526528
<value key="maxSize" type="size" width="1000" height="122"/>
527529
<view key="contentView" id="372">
528530
<rect key="frame" x="0.0" y="0.0" width="805" height="122"/>
529531
<autoresizingMask key="autoresizingMask"/>
530532
<subviews>
531-
<customView id="450" customClass="MGScopeBar">
533+
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="450" customClass="MGScopeBar">
532534
<rect key="frame" x="0.0" y="97" width="805" height="25"/>
533535
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
534-
<animations/>
535536
<connections>
536537
<outlet property="delegate" destination="451" id="456"/>
537538
</connections>
538539
</customView>
539-
<textField verticalHuggingPriority="750" id="452">
540+
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="452">
540541
<rect key="frame" x="17" y="48" width="771" height="17"/>
541542
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
542-
<animations/>
543543
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="453">
544544
<font key="font" metaFont="system"/>
545545
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -550,11 +550,11 @@
550550
</connections>
551551
</textField>
552552
</subviews>
553-
<animations/>
554553
</view>
555554
<connections>
556555
<outlet property="initialFirstResponder" destination="450" id="459"/>
557556
</connections>
557+
<point key="canvasLocation" x="139" y="-1"/>
558558
</window>
559559
<customObject id="420" customClass="NSFontManager"/>
560560
<customObject id="451" customClass="AppController">
@@ -568,17 +568,15 @@
568568
<rect key="frame" x="0.0" y="0.0" width="54" height="20"/>
569569
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
570570
<subviews>
571-
<button verticalHuggingPriority="750" id="462">
571+
<button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="462">
572572
<rect key="frame" x="1" y="0.0" width="52" height="19"/>
573573
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
574-
<animations/>
575574
<buttonCell key="cell" type="roundRect" title="Save" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="463">
576575
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
577576
<font key="font" metaFont="cellTitle"/>
578577
</buttonCell>
579578
</button>
580579
</subviews>
581-
<animations/>
582580
</customView>
583581
</objects>
584582
</document>

‎Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string></string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎MGScopeBar.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ @interface MGScopeBar (MGPrivateMethods)
6161
- (IBAction)scopeButtonClicked:(id)sender;
6262
- (NSButton *)getButtonForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber; // returns relevant button/menu-item
6363
- (void)updateSelectedState:(BOOL)selected forItem:(NSString *)identifier inGroup:(NSInteger)groupNumber informDelegate:(BOOL)inform;
64-
- (NSButton *)buttonForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
64+
- (NSButton *)buttonForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
6565
withTitle:(NSString *)title image:(NSImage *)image; // creates a new NSButton
66-
- (NSMenuItem *)menuItemForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
66+
- (NSMenuItem *)menuItemForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
6767
withTitle:(NSString *)title image:(NSImage *)image; // creates a new NSMenuitem
6868
- (NSPopUpButton *)popupButtonForGroup:(NSDictionary *)group;
6969
- (void)setControl:(NSObject *)control forIdentifier:(NSString *)identifier inGroup:(NSInteger)groupNumber;
@@ -141,7 +141,7 @@ - (void)reloadData
141141

142142
// Configure contents via delegate.
143143
if (self.delegate && [delegate conformsToProtocol:@protocol(MGScopeBarDelegate)]) {
144-
NSUInteger numGroups = [delegate numberOfGroupsInScopeBar:self];
144+
int numGroups = [delegate numberOfGroupsInScopeBar:self];
145145

146146
if (numGroups > 0) {
147147
_separatorPositions = [[NSMutableArray alloc] initWithCapacity:numGroups];
@@ -685,7 +685,7 @@ - (NSButton *)getButtonForItem:(NSString *)identifier inGroup:(NSInteger)groupNu
685685
}
686686

687687

688-
- (NSButton *)buttonForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
688+
- (NSButton *)buttonForItem:(NSString *)identifier inGroup:(NSInteger)groupNumber
689689
withTitle:(NSString *)title image:(NSImage *)image
690690
{
691691
NSRect ctrlRect = NSMakeRect(0, 0, 50, 20); // arbitrary size; will be resized later.

‎MGScopeBar.xcodeproj/project.pbxproj‎

Lines changed: 79 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
/* End PBXBuildFile section */
2525

2626
/* Begin PBXFileReference section */
27-
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
2827
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
2928
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
30-
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
3129
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
3230
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
3331
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
3432
32CA4F630368D1EE00C91783 /* MGScopeBar_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGScopeBar_Prefix.pch; sourceTree = "<group>"; };
33+
6F9CFC08233273B60061EBAD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
34+
6F9CFC0A233273BB0061EBAD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
3535
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3636
8D1107320486CEB800E47090 /* MGScopeBar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MGScopeBar.app; sourceTree = BUILT_PRODUCTS_DIR; };
3737
AAE785781419184700A6955E /* MGScopeBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MGScopeBar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -241,14 +241,15 @@
241241
29B97313FDCFA39411CA2CEA /* Project object */ = {
242242
isa = PBXProject;
243243
attributes = {
244-
LastUpgradeCheck = 0420;
244+
LastUpgradeCheck = 1100;
245245
};
246246
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MGScopeBar" */;
247247
compatibilityVersion = "Xcode 3.2";
248-
developmentRegion = English;
248+
developmentRegion = en;
249249
hasScannedForEncodings = 1;
250250
knownRegions = (
251251
en,
252+
Base,
252253
);
253254
mainGroup = 29B97314FDCFA39411CA2CEA /* MGScopeBar */;
254255
projectDirPath = "";
@@ -307,15 +308,15 @@
307308
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
308309
isa = PBXVariantGroup;
309310
children = (
310-
089C165DFE840E0CC02AAC07 /* English */,
311+
6F9CFC08233273B60061EBAD /* en */,
311312
);
312313
name = InfoPlist.strings;
313314
sourceTree = "<group>";
314315
};
315316
1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
316317
isa = PBXVariantGroup;
317318
children = (
318-
1DDD58150DA1D0A300B32029 /* English */,
319+
6F9CFC0A233273BB0061EBAD /* Base */,
319320
);
320321
name = MainMenu.xib;
321322
sourceTree = "<group>";
@@ -335,7 +336,8 @@
335336
isa = XCBuildConfiguration;
336337
buildSettings = {
337338
ALWAYS_SEARCH_USER_PATHS = NO;
338-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
339+
CLANG_ENABLE_OBJC_WEAK = YES;
340+
COMBINE_HIDPI_IMAGES = YES;
339341
COPY_PHASE_STRIP = NO;
340342
DEFINES_MODULE = YES;
341343
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -356,8 +358,9 @@
356358
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
357359
INFOPLIST_FILE = "MGScopeBarFramework/MGScopeBarFramework-Info.plist";
358360
INSTALL_PATH = "@loader_path/../Frameworks";
359-
MACOSX_DEPLOYMENT_TARGET = 10.7;
361+
MACOSX_DEPLOYMENT_TARGET = 10.9;
360362
ONLY_ACTIVE_ARCH = YES;
363+
PRODUCT_BUNDLE_IDENTIFIER = "com.instinctivecode.${PRODUCT_NAME:rfc1034identifier}";
361364
PRODUCT_NAME = MGScopeBar;
362365
SDKROOT = macosx;
363366
SKIP_INSTALL = YES;
@@ -369,7 +372,8 @@
369372
isa = XCBuildConfiguration;
370373
buildSettings = {
371374
ALWAYS_SEARCH_USER_PATHS = NO;
372-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
375+
CLANG_ENABLE_OBJC_WEAK = YES;
376+
COMBINE_HIDPI_IMAGES = YES;
373377
COPY_PHASE_STRIP = YES;
374378
DEFINES_MODULE = YES;
375379
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -384,7 +388,8 @@
384388
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
385389
INFOPLIST_FILE = "MGScopeBarFramework/MGScopeBarFramework-Info.plist";
386390
INSTALL_PATH = "@loader_path/../Frameworks";
387-
MACOSX_DEPLOYMENT_TARGET = 10.7;
391+
MACOSX_DEPLOYMENT_TARGET = 10.9;
392+
PRODUCT_BUNDLE_IDENTIFIER = "com.instinctivecode.${PRODUCT_NAME:rfc1034identifier}";
388393
PRODUCT_NAME = MGScopeBar;
389394
SDKROOT = macosx;
390395
SKIP_INSTALL = YES;
@@ -396,50 +401,112 @@
396401
isa = XCBuildConfiguration;
397402
buildSettings = {
398403
ALWAYS_SEARCH_USER_PATHS = NO;
404+
CLANG_ENABLE_OBJC_WEAK = YES;
405+
CODE_SIGN_IDENTITY = "-";
406+
COMBINE_HIDPI_IMAGES = YES;
399407
COPY_PHASE_STRIP = NO;
400408
GCC_DYNAMIC_NO_PIC = NO;
401409
GCC_OPTIMIZATION_LEVEL = 0;
402410
GCC_PRECOMPILE_PREFIX_HEADER = YES;
403411
GCC_PREFIX_HEADER = MGScopeBar_Prefix.pch;
404412
INFOPLIST_FILE = Info.plist;
405413
INSTALL_PATH = "$(HOME)/Applications";
414+
MACOSX_DEPLOYMENT_TARGET = 10.9;
415+
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:identifier}";
406416
PRODUCT_NAME = MGScopeBar;
417+
SDKROOT = macosx;
418+
VALID_ARCHS = x86_64;
407419
};
408420
name = Debug;
409421
};
410422
C01FCF4C08A954540054247B /* Release */ = {
411423
isa = XCBuildConfiguration;
412424
buildSettings = {
413425
ALWAYS_SEARCH_USER_PATHS = NO;
426+
CLANG_ENABLE_OBJC_WEAK = YES;
427+
CODE_SIGN_IDENTITY = "-";
428+
COMBINE_HIDPI_IMAGES = YES;
414429
GCC_PRECOMPILE_PREFIX_HEADER = YES;
415430
GCC_PREFIX_HEADER = MGScopeBar_Prefix.pch;
416431
INFOPLIST_FILE = Info.plist;
417432
INSTALL_PATH = "$(HOME)/Applications";
433+
MACOSX_DEPLOYMENT_TARGET = 10.9;
434+
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:identifier}";
418435
PRODUCT_NAME = MGScopeBar;
436+
SDKROOT = macosx;
437+
VALID_ARCHS = x86_64;
419438
};
420439
name = Release;
421440
};
422441
C01FCF4F08A954540054247B /* Debug */ = {
423442
isa = XCBuildConfiguration;
424443
buildSettings = {
425-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
444+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
445+
CLANG_WARN_BOOL_CONVERSION = YES;
446+
CLANG_WARN_COMMA = YES;
447+
CLANG_WARN_CONSTANT_CONVERSION = YES;
448+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
449+
CLANG_WARN_EMPTY_BODY = YES;
450+
CLANG_WARN_ENUM_CONVERSION = YES;
451+
CLANG_WARN_INFINITE_RECURSION = YES;
452+
CLANG_WARN_INT_CONVERSION = YES;
453+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
454+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
455+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
456+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
457+
CLANG_WARN_STRICT_PROTOTYPES = YES;
458+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
459+
CLANG_WARN_UNREACHABLE_CODE = YES;
460+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
426461
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
462+
ENABLE_STRICT_OBJC_MSGSEND = YES;
463+
ENABLE_TESTABILITY = YES;
427464
GCC_C_LANGUAGE_STANDARD = c99;
465+
GCC_NO_COMMON_BLOCKS = YES;
428466
GCC_OPTIMIZATION_LEVEL = 0;
467+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
429468
GCC_WARN_ABOUT_RETURN_TYPE = YES;
469+
GCC_WARN_UNDECLARED_SELECTOR = YES;
470+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
471+
GCC_WARN_UNUSED_FUNCTION = YES;
430472
GCC_WARN_UNUSED_VARIABLE = YES;
473+
MACOSX_DEPLOYMENT_TARGET = 10.9;
474+
ONLY_ACTIVE_ARCH = YES;
431475
RUN_CLANG_STATIC_ANALYZER = YES;
432476
};
433477
name = Debug;
434478
};
435479
C01FCF5008A954540054247B /* Release */ = {
436480
isa = XCBuildConfiguration;
437481
buildSettings = {
438-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
482+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
483+
CLANG_WARN_BOOL_CONVERSION = YES;
484+
CLANG_WARN_COMMA = YES;
485+
CLANG_WARN_CONSTANT_CONVERSION = YES;
486+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
487+
CLANG_WARN_EMPTY_BODY = YES;
488+
CLANG_WARN_ENUM_CONVERSION = YES;
489+
CLANG_WARN_INFINITE_RECURSION = YES;
490+
CLANG_WARN_INT_CONVERSION = YES;
491+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
492+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
493+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
494+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
495+
CLANG_WARN_STRICT_PROTOTYPES = YES;
496+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
497+
CLANG_WARN_UNREACHABLE_CODE = YES;
498+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
439499
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
500+
ENABLE_STRICT_OBJC_MSGSEND = YES;
440501
GCC_C_LANGUAGE_STANDARD = c99;
502+
GCC_NO_COMMON_BLOCKS = YES;
503+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
441504
GCC_WARN_ABOUT_RETURN_TYPE = YES;
505+
GCC_WARN_UNDECLARED_SELECTOR = YES;
506+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
507+
GCC_WARN_UNUSED_FUNCTION = YES;
442508
GCC_WARN_UNUSED_VARIABLE = YES;
509+
MACOSX_DEPLOYMENT_TARGET = 10.9;
443510
};
444511
name = Release;
445512
};

‎MGScopeBar.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MGScopeBarDelegateProtocol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef enum _MGScopeBarGroupSelectionMode {
2424
// Note: all groupNumber parameters are zero-based.
2525

2626
@required
27-
- (NSUInteger)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar;
27+
- (NSInteger)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar;
2828
- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(NSInteger)groupNumber;
2929
- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(NSInteger)groupNumber; // return nil or an empty string for no label.
3030
- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(NSInteger)groupNumber;

‎MGScopeBarFramework/MGScopeBarFramework-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string></string>
1111
<key>CFBundleIdentifier</key>
12-
<string>com.instinctivecode.${PRODUCT_NAME:rfc1034identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

‎English.lproj/InfoPlist.strings‎ renamed to ‎en.lproj/InfoPlist.strings‎

File renamed without changes.

0 commit comments

Comments
 (0)