Skip to content

Commit

Permalink
Merge branch 'feature/fastlane'
Browse files Browse the repository at this point in the history
  • Loading branch information
Piergiuseppe Longo committed Jan 21, 2017
2 parents 6da22f8 + e708d41 commit 3a0ec70
Show file tree
Hide file tree
Showing 13 changed files with 216 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ ThirdParty/boost/*
# Maya temporary
.mayaSwatches/
UserInterfaceState.xcuserstate

fastlane/report.xml

fastlane/test_output/report.html
2 changes: 1 addition & 1 deletion Demo/DemoViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class DemoViewController: UIViewController {
return .lightContent
}

func delay(_ delay: Double, closure:@escaping ()->()) {
func delay(_ delay: Double, closure:@escaping () -> Void) {
DispatchQueue.main.asyncAfter(
deadline: DispatchTime.now() + Double(Int64(delay * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC), execute: closure)
}
Expand Down
2 changes: 1 addition & 1 deletion Demo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>4.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"

gem "fastlane"
147 changes: 147 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.4)
activesupport (4.2.7.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
babosa (1.0.2)
claide (1.0.1)
colored (1.2)
commander (4.4.3)
highline (~> 1.7.2)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.2)
excon (0.54.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.11.0)
faraday (>= 0.7.4, < 1.0)
fastimage (2.0.1)
addressable (~> 2)
fastlane (2.9.0)
activesupport (< 5)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (~> 1.12)
colored
commander (>= 4.4.0, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
excon (>= 0.45.0, < 1.0.0)
faraday (~> 0.9)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.9)
fastimage (>= 1.6)
gh_inspector (>= 1.0.1, < 2.0.0)
google-api-client (~> 0.9.2)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
mini_magick (~> 4.5.1)
multi_json
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 1.1.0, < 2.0.0)
security (= 0.1.3)
slack-notifier (>= 1.3, < 2.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 0.20, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.0.3)
google-api-client (0.9.23)
addressable (~> 2.3)
googleauth (~> 0.5)
httpclient (~> 2.7)
hurley (~> 0.1)
memoist (~> 0.11)
mime-types (>= 1.6)
representable (~> 2.3.0)
retriable (~> 2.0)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
highline (1.7.8)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
hurley (0.2)
i18n (0.7.0)
json (1.8.6)
jwt (1.5.6)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
memoist (0.15.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.5.1)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.3)
os (0.9.6)
plist (3.2.0)
public_suffix (2.0.5)
representable (2.3.0)
uber (~> 0.0.7)
retriable (2.1.0)
rouge (1.11.1)
rubyzip (1.2.0)
security (0.1.3)
signet (0.7.3)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
slack-notifier (1.5.1)
terminal-notifier (1.7.1)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.15)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
unicode-display_width (1.1.3)
word_wrap (1.0.0)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.3)
xcpretty (0.2.4)
rouge (~> 1.8)
xcpretty-travis-formatter (0.0.4)
xcpretty (~> 0.2, >= 0.0.7)

PLATFORMS
ruby

DEPENDENCIES
fastlane

BUNDLED WITH
1.14.0
2 changes: 1 addition & 1 deletion PKHUD/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>4.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
10 changes: 5 additions & 5 deletions PKHUD/PKHUD.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ open class PKHUD: NSObject {
.flexibleRightMargin,
.flexibleTopMargin,
.flexibleBottomMargin ]

self.container.isAccessibilityElement = true
self.container.accessibilityIdentifier = "PKHUD"
}
Expand Down Expand Up @@ -114,7 +114,7 @@ open class PKHUD: NSObject {
let timer = Timer(timeInterval: graceTime, target: self, selector: #selector(PKHUD.handleGraceTimer(_:)), userInfo: nil, repeats: false)
RunLoop.current.add(timer, forMode: .commonModes)
graceTimer = timer
}else{
} else {
showContent()
}
}
Expand All @@ -124,7 +124,7 @@ open class PKHUD: NSObject {
container.showFrameView()
startAnimatingContentView()
}

open func hide(animated anim: Bool = true, completion: TimerAction? = nil) {
graceTimer?.invalidate()

Expand Down Expand Up @@ -168,9 +168,9 @@ open class PKHUD: NSObject {
animatingContentView.stopAnimation?()
}
}

// MARK: Timer callbacks

internal func performDelayedHide(_ timer: Timer? = nil) {
let userInfo = timer?.userInfo as? [String:AnyObject]
let key = userInfo?["timerActionKey"] as? String
Expand Down
2 changes: 1 addition & 1 deletion PKHUD/Window.swift
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ internal class ContainerView: UIView {
UIView.animate(withDuration: 0.8, animations: {
self.frameView.alpha = 0.0
self.hideBackground(animated: false)
}, completion: { bool in finalize(true) })
}, completion: { _ in finalize(true) })
} else {
self.frameView.alpha = 0.0
finalize(true)
Expand Down
2 changes: 1 addition & 1 deletion PKHUDDemoUITests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>4.1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
1 change: 1 addition & 0 deletions fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
app_identifier "com.NSExceptional.PKHUD-Demo" # The bundle identifier of your app
22 changes: 22 additions & 0 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
fastlane_version "2.7.0"
default_platform :ios

platform :ios do

before_all do |lane, options|
swiftlint(mode: :autocorrect)
scan
end

lane :test do
end

lane :pod do |options|
desc "Release a new pod Version"
pod_lib_lint
increment_version_number(bump_type: options[:bump_type])
version_bump_podspec(bump_type: options[:bump_type])
error do |lane, exception|
end
end
end
24 changes: 24 additions & 0 deletions fastlane/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
fastlane documentation
================
# Installation
```
sudo gem install fastlane
```
# Available Actions
## iOS
### ios test
```
fastlane ios test
```

### ios pod
```
fastlane ios pod
```


----

This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
More information about fastlane can be found on [https://fastlane.tools](https://fastlane.tools).
The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane).
5 changes: 5 additions & 0 deletions fastlane/Scanfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
clean true
output_types "html"
devices ["iPhone 5s", "iPhone 6s", "iPhone 7", "iPad Air"]
scheme "PKHUD Demo"
open_report true

0 comments on commit 3a0ec70

Please sign in to comment.