Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoeMatt
JoeMatt committed Oct 29, 2019
2 parents 07e2b17 + ae951b8 commit 36c74ac
Show file tree
Hide file tree
Showing 107 changed files with 1,090 additions and 1,087 deletions.
10 changes: 5 additions & 5 deletions .jazzy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ readme: README.md
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'

# ---- URLs ----
author_url: https://herotransitions.github.io/
dash_url: https://herotransitions.github.io/docsets/ScreenKitFramework.xml
github_url: https://github.com/HeroTransitions/Hero
github_file_prefix: https://github.com/HeroTransitions/Hero/tree/version/1.5.0/
author_url: https://herotransitions.github.io/Hero/
dash_url: https://herotransitions.github.io/Hero/docsets/Hero.xml
github_url: https://github.com/HeroTransitions/Hero/
github_file_prefix: https://github.com/HeroTransitions/Hero/tree/1.5.0/

# ---- Sources ----
podspec: Hero.podspec
Expand All @@ -21,7 +21,7 @@ min_acl: public
hide_documentation_coverage: false
skip_undocumented: false
objc: false
swift_version: 5.0.1
# swift_version: 5.1.0

# ---- Formatting ----
theme: fullwidth
2 changes: 1 addition & 1 deletion Hero.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.homepage = 'https://github.com/HeroTransitions/Hero'
s.screenshots = 'https://github.com/HeroTransitions/Hero/blob/master/Resources/Hero.png?raw=true'
s.documentation_url = 'https://herotransitions.github.io/Hero/'
s.screenshots = [ https://git.io/JeRkv, https://git.io/JeRke, https://git.io/JeRkf, https://git.io/JeRkJ]
s.screenshots = ['https://git.io/JeRkv', 'https://git.io/JeRke', 'https://git.io/JeRkf', 'https://git.io/JeRkJ']
s.license = { :type => 'MIT' }
s.author = {
'Luke' => 'lzhaoyilun@gmail.com',
Expand Down
36 changes: 18 additions & 18 deletions docs/Classes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="https://github.com/HeroTransitions/Hero">
<a class="header-link" href="https://github.com/HeroTransitions/Hero/">
<img class="header-icon" src="img/gh.png"/>
View on GitHub
</a>
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2Fdocsets%2FScreenKitFramework%2Exml">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2FHero%2Fdocsets%2FHero%2Exml">
<img class="header-icon" src="img/dash.png"/>
Install in Dash
</a>
Expand Down Expand Up @@ -272,7 +272,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Debug Plugin/HeroDebugPlugin.swift#L26-L73">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Debug Plugin/HeroDebugPlugin.swift#L26-L73">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/HeroCompatible.swift#L38-L44">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/HeroCompatible.swift#L39-L45">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -342,7 +342,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/HeroContext.swift#L25-L79">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/HeroContext.swift#L25-L79">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -377,7 +377,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/HeroModifier.swift#L25-L30">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/HeroModifier.swift#L25-L30">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -412,7 +412,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/HeroPlugin.swift#L25-L131">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/HeroPlugin.swift#L25-L131">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -447,7 +447,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Lexer.swift#L30-L63">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Lexer.swift#L30-L63">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -482,7 +482,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L11-L20">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L11-L20">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -513,7 +513,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L26-L35">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L26-L35">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -544,7 +544,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L37-L41">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L37-L41">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -575,7 +575,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L43-L54">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L43-L54">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -606,7 +606,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L56-L65">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L56-L65">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -637,7 +637,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L67-L76">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L67-L76">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -668,7 +668,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L78-L89">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L78-L89">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -703,7 +703,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Parser.swift#L21-L167">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Parser.swift#L21-L167">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -738,7 +738,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Transition/HeroTransition.swift#L51-L209">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Transition/HeroTransition.swift#L51-L209">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -777,7 +777,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Transition/HeroTransition.swift#L41-L44">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Transition/HeroTransition.swift#L41-L44">Show on GitHub</a>
</div>
</section>
</div>
Expand Down
12 changes: 6 additions & 6 deletions docs/Classes/BinaryOpNode.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="https://github.com/HeroTransitions/Hero">
<a class="header-link" href="https://github.com/HeroTransitions/Hero/">
<img class="header-icon" src="../img/gh.png"/>
View on GitHub
</a>
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2Fdocsets%2FScreenKitFramework%2Exml">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2FHero%2Fdocsets%2FHero%2Exml">
<img class="header-icon" src="../img/dash.png"/>
Install in Dash
</a>
Expand Down Expand Up @@ -277,7 +277,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -337,7 +337,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L46-L48">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L46-L48">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -367,7 +367,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L49-L53">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L49-L53">Show on GitHub</a>
</div>
</section>
</div>
Expand Down
10 changes: 5 additions & 5 deletions docs/Classes/CallNode.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="https://github.com/HeroTransitions/Hero">
<a class="header-link" href="https://github.com/HeroTransitions/Hero/">
<img class="header-icon" src="../img/gh.png"/>
View on GitHub
</a>
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2Fdocsets%2FScreenKitFramework%2Exml">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2FHero%2Fdocsets%2FHero%2Exml">
<img class="header-icon" src="../img/dash.png"/>
Install in Dash
</a>
Expand Down Expand Up @@ -277,7 +277,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L58-L60">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L58-L60">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -337,7 +337,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L61-L64">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L61-L64">Show on GitHub</a>
</div>
</section>
</div>
Expand Down
12 changes: 6 additions & 6 deletions docs/Classes/ExprNode.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="https://github.com/HeroTransitions/Hero">
<a class="header-link" href="https://github.com/HeroTransitions/Hero/">
<img class="header-icon" src="../img/gh.png"/>
View on GitHub
</a>
</p>

<p class="header-col header-col--secondary">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2Fdocsets%2FScreenKitFramework%2Exml">
<a class="header-link" href="dash-feed://https%3A%2F%2Fherotransitions%2Egithub%2Eio%2FHero%2Fdocsets%2FHero%2Exml">
<img class="header-icon" src="../img/dash.png"/>
Install in Dash
</a>
Expand Down Expand Up @@ -277,7 +277,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -307,7 +307,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -336,7 +336,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L14-L16">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L14-L16">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -366,7 +366,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/version/1.5.0//Sources/Parser/Nodes.swift#L17-L19">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.5.0//Sources/Parser/Nodes.swift#L17-L19">Show on GitHub</a>
</div>
</section>
</div>
Expand Down
Loading

0 comments on commit 36c74ac

Please sign in to comment.