vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #86 from mattrubin/swiftlint

Browse Source 
Improvements for SwiftLint 0.18
This commit is contained in:
Matt Rubin 2017-04-24 12:49:51 -04:00 committed by GitHub
commit f2d94c4322
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.swiftlint.yml
View File

@ -3,6 +3,7 @@ disabled_rules:
- force_cast - force_cast
- force_try - force_try
- function_body_length - function_body_length
- identifier_name
- type_body_length - type_body_length
opt_in_rules: opt_in_rules:
@ -12,7 +13,9 @@ opt_in_rules:
- conditional_returns_on_newline - conditional_returns_on_newline
- empty_count - empty_count
- explicit_init - explicit_init
- fatal_error_message
- first_where - first_where
- implicitly_unwrapped_optional
- overridden_super_call - overridden_super_call
- private_outlet - private_outlet
- prohibited_super_call - prohibited_super_call

2
.travis.yml
View File

@ -1,6 +1,6 @@
language: objective-c language: objective-c
osx_image: xcode8.2 osx_image: xcode8.3
sudo: false # Enable container-based builds sudo: false # Enable container-based builds

3
SwiftGit2.xcodeproj/project.pbxproj
View File

@ -729,7 +729,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint is not installed\"\nfi"; shellScript = "if which swiftlint >/dev/null; then\n swiftlint --lenient\nelse\n echo \"warning: SwiftLint is not installed\"\nfi";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
@ -1180,6 +1180,7 @@
C9CE0DD51E0710BD0053205D /* Release */, C9CE0DD51E0710BD0053205D /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };

2
SwiftGit2/Repository.swift
View File

@ -15,7 +15,7 @@ public typealias CheckoutProgressBlock = (String?, Int, Int) -> Void
/// Helper function used as the libgit2 progress callback in git_checkout_options. /// Helper function used as the libgit2 progress callback in git_checkout_options.
/// This is a function with a type signature of git_checkout_progress_cb. /// This is a function with a type signature of git_checkout_progress_cb.
private func checkoutProgressCallback(path: UnsafePointer<Int8>?, completedSteps: Int, totalSteps: Int, private func checkoutProgressCallback(path: UnsafePointer<Int8>?, completedSteps: Int, totalSteps: Int,
payload: UnsafeMutableRawPointer?) -> Void { payload: UnsafeMutableRawPointer?) {
if let payload = payload { if let payload = payload {
let buffer = payload.assumingMemoryBound(to: CheckoutProgressBlock.self) let buffer = payload.assumingMemoryBound(to: CheckoutProgressBlock.self)
let block: CheckoutProgressBlock let block: CheckoutProgressBlock