Skip to content

Commit

Permalink
Merge branch 'release/1.6.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeMatt committed Jan 23, 2025
2 parents b307e2d + b0a2c2b commit 670b81e
Show file tree
Hide file tree
Showing 117 changed files with 442 additions and 308 deletions.
2 changes: 1 addition & 1 deletion .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ---- About ----
module: Hero
module_version: 1.6.3
module_version: 1.6.4
author: HeroTransitions
readme: README.md
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'
Expand Down
3 changes: 1 addition & 2 deletions .makefiles/ios.mk
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ test:

#> Make a .zip package of frameworks
package:
carthage build --no-skip-current --platform $(PLATFORM)
carthage build --no-skip-current --platform $(PLATFORM) --use-xcframeworks --cache-builds
carthage archive $(MODULE_NAME)

#> tag and release to github
Expand All @@ -207,4 +207,3 @@ open:
#> Setup the project, git-hooks etc
init:
git config core.hooksPath .githooks

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransit

--------------------------------------

## [1.6.4](https://github.com/HeroTransitions/Hero/releases/tag/1.6.4)

- Fix XCode 16

## [1.6.3](https://github.com/HeroTransitions/Hero/releases/tag/1.6.3)

- 1ac98e7 Adaption for visionOS.
Expand Down
2 changes: 1 addition & 1 deletion Hero.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Pod::Spec.new do |s|
s.name = 'Hero'
s.version = '1.6.3'
s.version = '1.6.4'
s.summary = 'Elegant transition library for iOS'

s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions Hero.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 1.6.3;
MARKETING_VERSION = 1.6.4;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1459,7 +1459,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 1.6.3;
MARKETING_VERSION = 1.6.4;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jazzy:

#> Markdown API using sourcedocs; https://github.com/eneko/SourceDocs
sourcedocs:
@sourcedocs generate -clean --spm-module Hero --output-folder docs
@sourcedocs generate --clean --output-folder docs

#> Run tests
swift_test:
Expand Down
40 changes: 40 additions & 0 deletions Package.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Package: **Hero**

## Products

List of products in this package:

| Product | Type | Targets |
| ------- | ---- | ------- |
| Hero | library | Hero |

_Libraries denoted 'automatic' can be both static or dynamic._

## Modules

### Program Modules

| Module | Type | Dependencies |
| ------ | ---- | ------------ |
| Hero | Regular | |

### Test Modules

| Module | Type | Dependencies |
| ------ | ---- | ------------ |
| HeroTests | Test | |

## External Dependencies

This package has zero dependencies 🎉

## Requirements

### Minimum Required Versions

| Platform | Version |
| -------- | ------- |
| tvOS | 10.0 |
| iOS | 10.0 |

This file was generated by [SourceDocs](https://github.com/eneko/SourceDocs) on 2024-02-06 02:01:40 +0000
24 changes: 24 additions & 0 deletions PackageModules.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
digraph ModuleDependencyGraph {
rankdir = LR
graph [fontname="Helvetica-light", style = filled, color = "#eaeaea"]
node [shape=box, fontname="Helvetica", style=filled]
edge [color="#545454"]

subgraph clusterRegular {
label = "Program Modules"
node [color="#caecec"]
"Hero"
}
subgraph clusterTest {
label = "Test Modules"
node [color="#aaccee"]
"HeroTests"
}
subgraph clusterExternal {
label = "External Dependencies"
node [color="#eeccaa"]
""
}

"HeroTests" -> ""
}
15 changes: 6 additions & 9 deletions Sources/HeroContext.swift
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ extension HeroContext {

unhide(view: view)

// capture a snapshot without alpha, cornerRadius, or shadows
let oldMaskedCorners: CACornerMask = {
if #available(iOS 11, tvOS 11, *) {
return view.layer.maskedCorners
} else {
return []
}
}()
let oldCornerRadius = view.layer.cornerRadius
let oldAlpha = view.alpha
let oldShadowRadius = view.layer.shadowRadius
Expand Down Expand Up @@ -229,7 +221,12 @@ extension HeroContext {
}
#endif

if #available(iOS 11, tvOS 11, *) {
if #available(iOSApplicationExtension 11.0, tvOSApplicationExtension 11.0, iOS 11, tvOS 11, *) {
// capture a snapshot without alpha, cornerRadius, or shadows
let oldMaskedCorners: CACornerMask = {
return view.layer.maskedCorners
}()

view.layer.maskedCorners = oldMaskedCorners
}
view.layer.cornerRadius = oldCornerRadius
Expand Down
4 changes: 2 additions & 2 deletions docs/Classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -781,7 +781,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/BinaryOpNode.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -382,7 +382,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/CallNode.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -352,7 +352,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/ExprNode.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -381,7 +381,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/FunctionNode.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -382,7 +382,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/Hero.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -300,7 +300,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
14 changes: 7 additions & 7 deletions docs/Classes/HeroContext.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -470,7 +470,7 @@ <h4>Return Value</h4>
<p>a snapshot view for animation</p>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L117-L307">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L117-L304">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -500,7 +500,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L318-L325">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L315-L322">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -530,7 +530,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L327-L333">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L324-L330">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -560,7 +560,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L338-L348">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L335-L345">Show on GitHub</a>
</div>
</section>
</div>
Expand Down Expand Up @@ -590,7 +590,7 @@ <h4>Declaration</h4>
</div>
</div>
<div class="slightly-smaller">
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L349-L358">Show on GitHub</a>
<a href="https://github.com/HeroTransitions/Hero/tree/1.6.2//Sources/HeroContext.swift#L346-L355">Show on GitHub</a>
</div>
</section>
</div>
Expand All @@ -604,7 +604,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/HeroDebugPlugin.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -359,7 +359,7 @@ <h1>HeroDebugPlugin</h1>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/HeroExtension.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -934,7 +934,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
4 changes: 2 additions & 2 deletions docs/Classes/HeroModifier.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<header class="header">
<p class="header-col header-col--primary">
<a class="header-link" href="../index.html">
Hero 1.6.3 Docs
Hero 1.6.4 Docs
</a>
(24% documented)
</p>
Expand Down Expand Up @@ -2231,7 +2231,7 @@ <h4>Declaration</h4>
</div>
<section class="footer">
<p>See <a class="link" href="https://github.com/HeroTransitions/Hero/blob/develop/LICENSE" target="_blank" rel="external noopener">license</a> for more details.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.2</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
<p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.4</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
</section>
</body>
</html>
Loading

0 comments on commit 670b81e

Please sign in to comment.