Skip to content

Commit d7c2ed1

Browse files
devSCdevSC
authored
Merge pull request #12 from devSC/feature-test-travis
Feature test travis
2 parents 418d286 + e0f0e31 commit d7c2ed1

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

‎Demo/WSProgressHUD.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
FED429071B63E262002A5294 /* image2.png in Resources */ = {isa = PBXBuildFile; fileRef = FED428F81B63E262002A5294 /* image2.png */; };
2222
FED429081B63E262002A5294 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FED428F91B63E262002A5294 /* Images.xcassets */; };
2323
FED429091B63E262002A5294 /* IMG_6584.png in Resources */ = {isa = PBXBuildFile; fileRef = FED428FA1B63E262002A5294 /* IMG_6584.png */; };
24-
FED4290A1B63E262002A5294 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FED428FB1B63E262002A5294 /* Info.plist */; };
2524
FED4290B1B63E262002A5294 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FED428FC1B63E262002A5294 /* main.m */; };
2625
FED4290C1B63E262002A5294 /* TabViewController1.m in Sources */ = {isa = PBXBuildFile; fileRef = FED428FE1B63E262002A5294 /* TabViewController1.m */; };
2726
FED4290D1B63E262002A5294 /* TabViewController2.m in Sources */ = {isa = PBXBuildFile; fileRef = FED429001B63E262002A5294 /* TabViewController2.m */; };
@@ -241,7 +240,7 @@
241240
FEDB74931B593589003DDB79 /* Project object */ = {
242241
isa = PBXProject;
243242
attributes = {
244-
LastUpgradeCheck = 0640;
243+
LastUpgradeCheck = 0820;
245244
ORGANIZATIONNAME = "wilson-yuan";
246245
TargetAttributes = {
247246
FEDB749A1B593589003DDB79 = {
@@ -283,7 +282,6 @@
283282
FED429281B63E2A0002A5294 /* Info.plist in Resources */,
284283
FE52FF2E1B649B9300703FB5 /* LICENSE in Resources */,
285284
FE52FF301B649B9300703FB5 /* WSProgressHUD.podspec in Resources */,
286-
FED4290A1B63E262002A5294 /* Info.plist in Resources */,
287285
FED429071B63E262002A5294 /* image2.png in Resources */,
288286
FED429091B63E262002A5294 /* IMG_6584.png in Resources */,
289287
FED429061B63E262002A5294 /* image1.jpg in Resources */,
@@ -370,14 +368,17 @@
370368
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
371369
CLANG_WARN_EMPTY_BODY = YES;
372370
CLANG_WARN_ENUM_CONVERSION = YES;
371+
CLANG_WARN_INFINITE_RECURSION = YES;
373372
CLANG_WARN_INT_CONVERSION = YES;
374373
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
374+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
375375
CLANG_WARN_UNREACHABLE_CODE = YES;
376376
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
377377
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
378378
COPY_PHASE_STRIP = NO;
379379
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
380380
ENABLE_STRICT_OBJC_MSGSEND = YES;
381+
ENABLE_TESTABILITY = YES;
381382
GCC_C_LANGUAGE_STANDARD = gnu99;
382383
GCC_DYNAMIC_NO_PIC = NO;
383384
GCC_NO_COMMON_BLOCKS = YES;
@@ -393,7 +394,7 @@
393394
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
394395
GCC_WARN_UNUSED_FUNCTION = YES;
395396
GCC_WARN_UNUSED_VARIABLE = YES;
396-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
397+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
397398
MTL_ENABLE_DEBUG_INFO = YES;
398399
ONLY_ACTIVE_ARCH = YES;
399400
SDKROOT = iphoneos;
@@ -414,8 +415,10 @@
414415
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
415416
CLANG_WARN_EMPTY_BODY = YES;
416417
CLANG_WARN_ENUM_CONVERSION = YES;
418+
CLANG_WARN_INFINITE_RECURSION = YES;
417419
CLANG_WARN_INT_CONVERSION = YES;
418420
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
421+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
419422
CLANG_WARN_UNREACHABLE_CODE = YES;
420423
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
421424
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -431,7 +434,7 @@
431434
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
432435
GCC_WARN_UNUSED_FUNCTION = YES;
433436
GCC_WARN_UNUSED_VARIABLE = YES;
434-
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
437+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
435438
MTL_ENABLE_DEBUG_INFO = NO;
436439
SDKROOT = iphoneos;
437440
TARGETED_DEVICE_FAMILY = "1,2";
@@ -444,8 +447,9 @@
444447
buildSettings = {
445448
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
446449
INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist";
447-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
450+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
448451
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
452+
PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)";
449453
PRODUCT_NAME = "$(TARGET_NAME)";
450454
};
451455
name = Debug;
@@ -455,8 +459,9 @@
455459
buildSettings = {
456460
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
457461
INFOPLIST_FILE = "$(SRCROOT)/WSProgressHUDDemo/Info.plist";
458-
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
462+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
459463
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
464+
PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)";
460465
PRODUCT_NAME = "$(TARGET_NAME)";
461466
};
462467
name = Release;
@@ -475,6 +480,7 @@
475480
);
476481
INFOPLIST_FILE = WSProgressHUDTests/Info.plist;
477482
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
483+
PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)";
478484
PRODUCT_NAME = "$(TARGET_NAME)";
479485
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WSProgressHUD.app/WSProgressHUD";
480486
};
@@ -490,6 +496,7 @@
490496
);
491497
INFOPLIST_FILE = WSProgressHUDTests/Info.plist;
492498
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
499+
PRODUCT_BUNDLE_IDENTIFIER = "com.ysc.$(PRODUCT_NAME:rfc1034identifier)";
493500
PRODUCT_NAME = "$(TARGET_NAME)";
494501
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WSProgressHUD.app/WSProgressHUD";
495502
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0710"
3+
LastUpgradeVersion = "0820"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Demo/WSProgressHUD/FBShimmeringLayer.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ - (void)layoutSublayers
133133
@end
134134

135135
@interface FBShimmeringLayer ()
136+
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
137+
// iOS 10 SDK has CALayerDelegate and CAAnimationDelegate as proper protocols.
138+
<CALayerDelegate, CAAnimationDelegate>
139+
#endif
136140
@property (strong, nonatomic) FBShimmeringMaskLayer *maskLayer;
137141
@end
138142

‎Demo/WSProgressHUDDemo/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.ysc.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎Demo/WSProgressHUDTests/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.ysc.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)