dnrops
/
stripe-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ci

This commit is contained in:
Jack Flintermann 2015-01-14 01:15:41 -05:00
parent d31292662a
commit 88a1436a57
8 changed files with 64 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -9,5 +9,5 @@ before_install:
script:
- "./ci_scripts/check_fauxpas.sh"
- "./ci_scripts/check_version.rb"
- set -o pipefail && xcodebuild test -project "Tests/Stripe Tests.xcodeproj" -scheme "iOS Tests" -destination 'platform=iOS Simulator,name=iPhone 5s,OS=7.1' -destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.1' | xcpretty -c
- set -o pipefail && xcodebuild test -project "Tests/Stripe Tests.xcodeproj" -scheme "OSX Tests" | xcpretty -c
- set -o pipefail && xcodebuild test -workspace Stripe.xcworkspace -scheme "StripeiOS Tests" -destination 'platform=iOS Simulator,name=iPhone 5s,OS=7.1' -destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.1' | xcpretty -c
- set -o pipefail && xcodebuild test -workspace Stripe.xcworkspace -scheme "StripeOSX Tests" | xcpretty -c

46
Stripe.xcodeproj/project.pbxproj
View File

@ -1097,6 +1097,7 @@
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
@ -1105,8 +1106,11 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Tests/Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@ -1124,12 +1128,16 @@
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CODE_SIGN_IDENTITY = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Tests/Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@ -1151,7 +1159,9 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
MTL_ENABLE_DEBUG_INFO = YES;
@ -1169,7 +1179,9 @@
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
MTL_ENABLE_DEBUG_INFO = NO;
@ -1182,6 +1194,8 @@
047E67E11A65E82D001D7493 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_SHADOW = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@ -1189,6 +1203,8 @@
047E67E21A65E82D001D7493 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_SHADOW = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@ -1206,7 +1222,9 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
MTL_ENABLE_DEBUG_INFO = YES;
@ -1227,7 +1245,9 @@
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
MTL_ENABLE_DEBUG_INFO = NO;
@ -1241,6 +1261,8 @@
049E85241A607FFD000B66CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_SHADOW = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@ -1248,6 +1270,8 @@
049E85251A607FFD000B66CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_SHADOW = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@ -1270,12 +1294,11 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Stripe/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@ -1303,12 +1326,11 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
);
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Stripe/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@ -1341,7 +1363,9 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Stripe/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@ -1372,7 +1396,9 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Stripe/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@ -1404,7 +1430,9 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Tests/Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
@ -1429,7 +1457,9 @@
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_SHADOW = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
INFOPLIST_FILE = Tests/Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";

2
Stripe/Checkout/STPCheckoutInternalUIWebViewController.m
View File

@ -215,7 +215,7 @@
completion:^(__unused BOOL finished) { [self.activityIndicator stopAnimating]; }];
}
- (void)checkoutAdapter:(__unused id<STPCheckoutWebViewAdapter>)adapter didError:(__unused NSError *)error {
- (void)checkoutAdapter:(__unused id<STPCheckoutWebViewAdapter>)adapter didError:(NSError *)error {
[self.activityIndicator stopAnimating];
[self.delegate checkoutController:self.checkoutController didFailWithError:error];
[self cleanup];

2
Stripe/Checkout/STPCheckoutViewController.m
View File

@ -169,7 +169,7 @@
- (void)checkoutAdapterDidFinishLoad:(__unused id<STPCheckoutWebViewAdapter>)adapter {
}
- (void)checkoutAdapter:(__unused id<STPCheckoutWebViewAdapter>)adapter didError:(__unused NSError *)error {
- (void)checkoutAdapter:(__unused id<STPCheckoutWebViewAdapter>)adapter didError:(NSError *)error {
[self.checkoutDelegate checkoutController:self didFailWithError:error];
}

2
Tests/Tests/STPApplePayTest.m
View File

@ -66,7 +66,7 @@
XCTestExpectation *expectation = [self expectationWithDescription:@"Bank account creation"];
[client createTokenWithPayment:payment
completion:^(__unused STPToken *token, NSError *error) {
completion:^(STPToken *token, NSError *error) {
[expectation fulfill];
XCTAssertNil(token, @"token should be nil");
XCTAssertNotNil(error, @"error should not be nil");

22
ci_scripts/FauxPasConfig/main.fauxpas.json
View File

@ -1,17 +1,17 @@
// Generated from the Faux Pas GUI
{
// Xcode target to check (String)
"target": "iOS Tests",
"target": "StripeOSXTests",
// Xcode build configuration to check (String)
"buildConfig": "Debug",
"buildConfig": "Release",
// Rules to apply (Array of strings)
"rules": ["IdentifierNaming","StrongInsteadOfRetain","XIBUnknownClassReference"],
//"rules": [],
// Rules to apply only (Array of strings)
//"onlyRules": [],
// Rule tags to apply (Array of strings)
"ruleTags": ["APIUsage","BestPractice","Config","Localization","Pedantic","Recommended","Resources","VCS"],
// Rules to exclude (Array of strings)
"excludedRules": ["BasicProjectSettings"],
"excludedRules": ["BasicProjectSettings","ImplicitBundleId","NSLogUsed"],
// Prefixes of files to exclude (Array of strings)
//"fileExclusionPrefixes": [],
// Xcode groups to exclude (Array of strings)
@ -37,6 +37,8 @@
//"cacheBuildLog": true,
// Use our own modules cache (Boolean)
//"useOwnModulesCache": true,
// Process only target precompiled headers (Boolean)
//"processOnlyTargetPCHs": true,
// Verbose output (Boolean)
//"verbose": false,
// Output format ("human" / "json" / "plist" / "xcode")
@ -567,6 +569,12 @@
// strings)
"ignoredFileRegexes": null
},
// Options for rule: Retain cycle in block API usage
"BlockAPIRetainCycle": {
// Regexes for ignored file paths (Array of regular expression
// strings)
"ignoredFileRegexes": null
},
// Options for rule: Retaining or copying delegate
"StrongDelegate": {
// Regexes for ignored file paths (Array of regular expression
@ -744,6 +752,12 @@
// strings)
"ignoredFileRegexes": null
},
// Options for rule: Using a variable marked unused
"UsedVariableMarkedUnused": {
// Regexes for ignored file paths (Array of regular expression
// strings)
"ignoredFileRegexes": null
},
// Options for rule: Weak reference to top-level XIB object
"WeakReferenceToTopLevelXIBObject": {
// Regexes for ignored file paths (Array of regular expression

2
ci_scripts/check_fauxpas.sh
View File

@ -6,4 +6,4 @@ if [[ $CI && "$TRAVIS_SECURE_ENV_VARS" != "true" ]]; then
fi
echo "Linting with Faux Pas..."
fauxpas check "./Tests/Stripe Tests.xcodeproj" --scheme "iOS Tests" --configFile "./ci_scripts/FauxPasConfig/main.fauxpas.json" --minErrorStatusSeverity Concern && fauxpas check "./Tests/Stripe Tests.xcodeproj" --scheme "OSX Tests" --configFile "./ci_scripts/FauxPasConfig/main.fauxpas.json" --minErrorStatusSeverity Concern
fauxpas check Stripe.xcodeproj/ --target "StripeiOS" --configFile "./ci_scripts/FauxPasConfig/main.fauxpas.json" --minErrorStatusSeverity Concern && fauxpas check Stripe.xcodeproj/ --target "StripeOSX" --configFile "./ci_scripts/FauxPasConfig/main.fauxpas.json" --minErrorStatusSeverity Concern

2
ci_scripts/check_version.rb
View File

@ -21,3 +21,5 @@ if ENV["TRAVIS_BRANCH"] == "master"
end
end
puts "Done!"