Skip to content

Commit 8a1bbd0

Browse files
baldophbaldoph
authored
Merge branch 'jdg:master' into master
2 parents 95dee73 + c843e4c commit 8a1bbd0

29 files changed

+317
-208
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode11.2
33

44
before_install:
55
- env
66
- locale
7-
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
87
- xcpretty --version
98
- xcodebuild -version
109
- xcodebuild -showsdks
@@ -13,8 +12,8 @@ script:
1312
- set -o pipefail
1413

1514
- xcodebuild clean build -workspace MBProgressHUD.xcworkspace -scheme HudDemo -sdk iphonesimulator -configuration Debug | xcpretty -c
16-
- xcodebuild clean build -workspace MBProgressHUD.xcworkspace -scheme HudDemoTV -sdk iphonesimulator -configuration Debug | xcpretty -c
17-
- xcodebuild clean build test -workspace MBProgressHUD.xcworkspace -scheme HudTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPad Air 2,OS=11.0" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
15+
- xcodebuild clean build -workspace MBProgressHUD.xcworkspace -scheme HudDemoTV -sdk appletvsimulator -configuration Debug | xcpretty -c
16+
- xcodebuild clean build test -workspace MBProgressHUD.xcworkspace -scheme HudTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPad Air (3rd generation),OS=13.2.2" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
1817

1918
after_success:
2019
- bash <(curl -s https://codecov.io/bash)

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Guidelines for bug reports:
2424
2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
2525
latest `master` branch in the repository.
2626

27-
3. **Isolate the problem** &mdash; provide exact reporduction steps, preferably
28-
in form of a failing test case or by providing modification steps in the
27+
3. **Isolate the problem** &mdash; provide exact reproduction steps, preferably
28+
in the form of a failing test case or by providing modification steps in the
2929
`MBProgressHUD` Demo application.
3030

3131
A good bug report shouldn't leave others needing to chase you up for more
@@ -61,4 +61,4 @@ accurate comments, etc.) and any other requirements (such as test coverage).
6161
**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
6262
license your work under the same license as that used by the project.
6363

64-
This document is based on https://github.com/necolas/issue-guidelines/blob/master/CONTRIBUTING.md.
64+
This document is based on https://github.com/necolas/issue-guidelines/blob/master/CONTRIBUTING.md.

‎Demo/HudDemo.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
D27F18641D3B5E21009D7482 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D27F18611D3B5E21009D7482 /* Main.storyboard */; };
2525
D286A76D1518CA9F00E13FB8 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D286A76C1518CA9F00E13FB8 /* CoreGraphics.framework */; };
2626
D2B174121C5E3A3D00021915 /* HudTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B174111C5E3A3D00021915 /* HudTests.m */; };
27+
D2D75D5323A8193100485497 /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2D75D5123A8193000485497 /* Launch.storyboard */; };
2728
D2EEB3811B55967200F59EC1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2EEB3801B55967200F59EC1 /* Images.xcassets */; };
2829
/* End PBXBuildFile section */
2930

@@ -63,9 +64,11 @@
6364
D27F18621D3B5E21009D7482 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = HudDemo/en.lproj/Main.storyboard; sourceTree = "<group>"; };
6465
D27F18651D3B5E2D009D7482 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = HudDemo/Info.plist; sourceTree = "<group>"; };
6566
D286A76C1518CA9F00E13FB8 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
67+
D2B1269B23CB8D9C00A01F4C /* HudDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HudDemo.entitlements; sourceTree = "<group>"; };
6668
D2B1740F1C5E3A3D00021915 /* HudTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HudTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6769
D2B174111C5E3A3D00021915 /* HudTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HudTests.m; sourceTree = "<group>"; };
6870
D2B174131C5E3A3D00021915 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
71+
D2D75D5223A8193000485497 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Launch.storyboard; sourceTree = "<group>"; };
6972
D2EEB3801B55967200F59EC1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = HudDemo/Images.xcassets; sourceTree = SOURCE_ROOT; };
7073
/* End PBXFileReference section */
7174

@@ -101,6 +104,7 @@
101104
080E96DDFE201D6D7F000001 /* HudDemo */ = {
102105
isa = PBXGroup;
103106
children = (
107+
D2B1269B23CB8D9C00A01F4C /* HudDemo.entitlements */,
104108
D27F18561D3B5DFF009D7482 /* MBHudDemoAppDelegate.h */,
105109
D27F18571D3B5DFF009D7482 /* MBHudDemoViewController.h */,
106110
D27F18581D3B5DFF009D7482 /* MBHudDemoAppDelegate.m */,
@@ -199,6 +203,7 @@
199203
D27F18671D3B5E43009D7482 /* Resources */ = {
200204
isa = PBXGroup;
201205
children = (
206+
D2D75D5123A8193000485497 /* Launch.storyboard */,
202207
D27F184C1D3B5878009D7482 /* Main.storyboard */,
203208
D27F18511D3B5878009D7482 /* Info.plist */,
204209
D274948A1D3B74AA00ABEB66 /* Images.xcassets */,
@@ -300,13 +305,9 @@
300305
};
301306
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HudDemo" */;
302307
compatibilityVersion = "Xcode 3.2";
303-
developmentRegion = English;
308+
developmentRegion = en;
304309
hasScannedForEncodings = 1;
305310
knownRegions = (
306-
English,
307-
Japanese,
308-
French,
309-
German,
310311
en,
311312
Base,
312313
);
@@ -338,6 +339,7 @@
338339
files = (
339340
D27F184E1D3B5878009D7482 /* Main.storyboard in Resources */,
340341
D274948B1D3B74AA00ABEB66 /* Images.xcassets in Resources */,
342+
D2D75D5323A8193100485497 /* Launch.storyboard in Resources */,
341343
);
342344
runOnlyForDeploymentPostprocessing = 0;
343345
};
@@ -416,6 +418,14 @@
416418
name = Main.storyboard;
417419
sourceTree = "<group>";
418420
};
421+
D2D75D5123A8193000485497 /* Launch.storyboard */ = {
422+
isa = PBXVariantGroup;
423+
children = (
424+
D2D75D5223A8193000485497 /* Base */,
425+
);
426+
name = Launch.storyboard;
427+
sourceTree = "<group>";
428+
};
419429
/* End PBXVariantGroup section */
420430

421431
/* Begin XCBuildConfiguration section */
@@ -424,15 +434,18 @@
424434
buildSettings = {
425435
ALWAYS_SEARCH_USER_PATHS = NO;
426436
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
437+
CODE_SIGN_ENTITLEMENTS = HudDemo/HudDemo.entitlements;
427438
COPY_PHASE_STRIP = NO;
439+
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
428440
GCC_DYNAMIC_NO_PIC = NO;
429441
GCC_OPTIMIZATION_LEVEL = 0;
430442
GCC_PRECOMPILE_PREFIX_HEADER = YES;
431443
GCC_PREFIX_HEADER = HudDemo/HudDemo_Prefix.pch;
432444
INFOPLIST_FILE = HudDemo/Info.plist;
433-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
445+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
434446
PRODUCT_BUNDLE_IDENTIFIER = "com.bukovinski.${PRODUCT_NAME:identifier}";
435447
PRODUCT_NAME = HudDemo;
448+
SUPPORTS_MACCATALYST = YES;
436449
TARGETED_DEVICE_FAMILY = "1,2";
437450
};
438451
name = Debug;
@@ -442,14 +455,17 @@
442455
buildSettings = {
443456
ALWAYS_SEARCH_USER_PATHS = NO;
444457
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
458+
CODE_SIGN_ENTITLEMENTS = HudDemo/HudDemo.entitlements;
445459
COPY_PHASE_STRIP = YES;
460+
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
446461
GCC_PRECOMPILE_PREFIX_HEADER = YES;
447462
GCC_PREFIX_HEADER = HudDemo/HudDemo_Prefix.pch;
448463
INFOPLIST_FILE = HudDemo/Info.plist;
449-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
464+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
450465
PRODUCT_BUNDLE_IDENTIFIER = "com.bukovinski.${PRODUCT_NAME:identifier}";
451466
PRODUCT_NAME = HudDemo;
452467
SDKROOT = iphoneos;
468+
SUPPORTS_MACCATALYST = YES;
453469
TARGETED_DEVICE_FAMILY = "1,2";
454470
};
455471
name = Release;
@@ -476,7 +492,6 @@
476492
CLANG_WARN_SUSPICIOUS_MOVE = YES;
477493
CLANG_WARN_UNREACHABLE_CODE = YES;
478494
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
479-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
480495
ENABLE_STRICT_OBJC_MSGSEND = YES;
481496
ENABLE_TESTABILITY = YES;
482497
GCC_C_LANGUAGE_STANDARD = c99;
@@ -488,7 +503,7 @@
488503
GCC_WARN_UNINITIALIZED_AUTOS = YES;
489504
GCC_WARN_UNUSED_FUNCTION = YES;
490505
GCC_WARN_UNUSED_VARIABLE = YES;
491-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
506+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
492507
ONLY_ACTIVE_ARCH = YES;
493508
SDKROOT = iphoneos;
494509
};
@@ -516,7 +531,6 @@
516531
CLANG_WARN_SUSPICIOUS_MOVE = YES;
517532
CLANG_WARN_UNREACHABLE_CODE = YES;
518533
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
519-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
520534
ENABLE_STRICT_OBJC_MSGSEND = YES;
521535
GCC_C_LANGUAGE_STANDARD = c99;
522536
GCC_NO_COMMON_BLOCKS = YES;
@@ -527,7 +541,7 @@
527541
GCC_WARN_UNINITIALIZED_AUTOS = YES;
528542
GCC_WARN_UNUSED_FUNCTION = YES;
529543
GCC_WARN_UNUSED_VARIABLE = YES;
530-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
544+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
531545
SDKROOT = iphoneos;
532546
};
533547
name = Release;
@@ -621,6 +635,7 @@
621635
MTL_ENABLE_DEBUG_INFO = YES;
622636
PRODUCT_BUNDLE_IDENTIFIER = com.bukovinski.HudTests;
623637
PRODUCT_NAME = "$(TARGET_NAME)";
638+
TARGETED_DEVICE_FAMILY = "1,2";
624639
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HudDemo.app/HudDemo";
625640
};
626641
name = Debug;
@@ -647,6 +662,7 @@
647662
MTL_ENABLE_DEBUG_INFO = NO;
648663
PRODUCT_BUNDLE_IDENTIFIER = com.bukovinski.HudTests;
649664
PRODUCT_NAME = "$(TARGET_NAME)";
665+
TARGETED_DEVICE_FAMILY = "1,2";
650666
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HudDemo.app/HudDemo";
651667
VALIDATE_PRODUCT = YES;
652668
};

‎Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudDemo.xcscheme‎

Lines changed: 13 additions & 7 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 = "0930"
3+
LastUpgradeVersion = "1120"
44
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,8 +41,6 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44-
<Testables>
45-
</Testables>
4644
<MacroExpansion>
4745
<BuildableReference
4846
BuildableIdentifier = "primary"
@@ -52,8 +50,18 @@
5250
ReferencedContainer = "container:HudDemo.xcodeproj">
5351
</BuildableReference>
5452
</MacroExpansion>
55-
<AdditionalOptions>
56-
</AdditionalOptions>
53+
<Testables>
54+
<TestableReference
55+
skipped = "NO">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "D2B1740E1C5E3A3D00021915"
59+
BuildableName = "HudTests.xctest"
60+
BlueprintName = "HudTests"
61+
ReferencedContainer = "container:HudDemo.xcodeproj">
62+
</BuildableReference>
63+
</TestableReference>
64+
</Testables>
5765
</TestAction>
5866
<LaunchAction
5967
buildConfiguration = "Debug"
@@ -77,8 +85,6 @@
7785
ReferencedContainer = "container:HudDemo.xcodeproj">
7886
</BuildableReference>
7987
</BuildableProductRunnable>
80-
<AdditionalOptions>
81-
</AdditionalOptions>
8288
</LaunchAction>
8389
<ProfileAction
8490
displayScaleIsEnabled = "NO"

‎Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudDemoTV.xcscheme‎

Lines changed: 3 additions & 7 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 = "0930"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:HudDemo.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:HudDemo.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

‎Demo/HudDemo.xcodeproj/xcshareddata/xcschemes/HudTests.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 = "0930"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -11,6 +11,15 @@
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
1313
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<MacroExpansion>
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
18+
BuildableName = "HudDemo.app"
19+
BlueprintName = "HudDemo"
20+
ReferencedContainer = "container:HudDemo.xcodeproj">
21+
</BuildableReference>
22+
</MacroExpansion>
1423
<Testables>
1524
<TestableReference
1625
skipped = "NO">
@@ -23,17 +32,6 @@
2332
</BuildableReference>
2433
</TestableReference>
2534
</Testables>
26-
<MacroExpansion>
27-
<BuildableReference
28-
BuildableIdentifier = "primary"
29-
BlueprintIdentifier = "1D6058900D05DD3D006BFB54"
30-
BuildableName = "HudDemo.app"
31-
BlueprintName = "HudDemo"
32-
ReferencedContainer = "container:HudDemo.xcodeproj">
33-
</BuildableReference>
34-
</MacroExpansion>
35-
<AdditionalOptions>
36-
</AdditionalOptions>
3735
</TestAction>
3836
<LaunchAction
3937
buildConfiguration = "Debug"
@@ -55,8 +53,6 @@
5553
ReferencedContainer = "container:HudDemo.xcodeproj">
5654
</BuildableReference>
5755
</BuildableProductRunnable>
58-
<AdditionalOptions>
59-
</AdditionalOptions>
6056
</LaunchAction>
6157
<ProfileAction
6258
buildConfiguration = "Release"

‎Demo/HudDemo/HudDemo.entitlements‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.app-sandbox</key>
6+
<true/>
7+
<key>com.apple.security.network.client</key>
8+
<true/>
9+
</dict>
10+
</plist>

‎Demo/HudDemo/Info.plist‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,6 @@
2828
<string>1.0</string>
2929
<key>LSRequiresIPhoneOS</key>
3030
<true/>
31-
<key>UILaunchImages</key>
32-
<array>
33-
<dict>
34-
<key>UILaunchImageMinimumOSVersion</key>
35-
<string>7.0</string>
36-
<key>UILaunchImageName</key>
37-
<string>Default-iOS7</string>
38-
<key>UILaunchImageOrientation</key>
39-
<string>Portrait</string>
40-
<key>UILaunchImageSize</key>
41-
<string>{320, 568}</string>
42-
</dict>
43-
<dict>
44-
<key>UILaunchImageMinimumOSVersion</key>
45-
<string>7.0</string>
46-
<key>UILaunchImageName</key>
47-
<string>Default-iOS7</string>
48-
<key>UILaunchImageOrientation</key>
49-
<string>Portrait</string>
50-
<key>UILaunchImageSize</key>
51-
<string>{320, 480}</string>
52-
</dict>
53-
</array>
5431
<key>UILaunchStoryboardName</key>
5532
<string>Launch</string>
5633
<key>UIMainStoryboardFile</key>

0 commit comments

Comments
 (0)