Skip to content

Commit 670b81e

Browse files
committed
Merge branch 'release/1.6.4'
2 parents b307e2d + b0a2c2b commit 670b81e

File tree

117 files changed

+442
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+442
-308
lines changed

.jazzy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ---- About ----
22
module: Hero
3-
module_version: 1.6.3
3+
module_version: 1.6.4
44
author: HeroTransitions
55
readme: README.md
66
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'

.makefiles/ios.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ test:
187187

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

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

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransit
44

55
--------------------------------------
66

7+
## [1.6.4](https://github.com/HeroTransitions/Hero/releases/tag/1.6.4)
8+
9+
- Fix XCode 16
10+
711
## [1.6.3](https://github.com/HeroTransitions/Hero/releases/tag/1.6.3)
812

913
- 1ac98e7 Adaption for visionOS.

Hero.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Pod::Spec.new do |s|
44
s.name = 'Hero'
5-
s.version = '1.6.3'
5+
s.version = '1.6.4'
66
s.summary = 'Elegant transition library for iOS'
77

88
s.description = <<-DESC

Hero.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@
14031403
GCC_WARN_UNUSED_FUNCTION = YES;
14041404
GCC_WARN_UNUSED_VARIABLE = YES;
14051405
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1406-
MARKETING_VERSION = 1.6.3;
1406+
MARKETING_VERSION = 1.6.4;
14071407
MTL_ENABLE_DEBUG_INFO = YES;
14081408
ONLY_ACTIVE_ARCH = YES;
14091409
SDKROOT = iphoneos;
@@ -1459,7 +1459,7 @@
14591459
GCC_WARN_UNUSED_FUNCTION = YES;
14601460
GCC_WARN_UNUSED_VARIABLE = YES;
14611461
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1462-
MARKETING_VERSION = 1.6.3;
1462+
MARKETING_VERSION = 1.6.4;
14631463
MTL_ENABLE_DEBUG_INFO = NO;
14641464
SDKROOT = iphoneos;
14651465
SWIFT_COMPILATION_MODE = wholemodule;

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jazzy:
2323

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

2828
#> Run tests
2929
swift_test:

Package.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Package: **Hero**
2+
3+
## Products
4+
5+
List of products in this package:
6+
7+
| Product | Type | Targets |
8+
| ------- | ---- | ------- |
9+
| Hero | library | Hero |
10+
11+
_Libraries denoted 'automatic' can be both static or dynamic._
12+
13+
## Modules
14+
15+
### Program Modules
16+
17+
| Module | Type | Dependencies |
18+
| ------ | ---- | ------------ |
19+
| Hero | Regular | |
20+
21+
### Test Modules
22+
23+
| Module | Type | Dependencies |
24+
| ------ | ---- | ------------ |
25+
| HeroTests | Test | |
26+
27+
## External Dependencies
28+
29+
This package has zero dependencies 🎉
30+
31+
## Requirements
32+
33+
### Minimum Required Versions
34+
35+
| Platform | Version |
36+
| -------- | ------- |
37+
| tvOS | 10.0 |
38+
| iOS | 10.0 |
39+
40+
This file was generated by [SourceDocs](https://github.com/eneko/SourceDocs) on 2024-02-06 02:01:40 +0000

PackageModules.dot

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
digraph ModuleDependencyGraph {
2+
rankdir = LR
3+
graph [fontname="Helvetica-light", style = filled, color = "#eaeaea"]
4+
node [shape=box, fontname="Helvetica", style=filled]
5+
edge [color="#545454"]
6+
7+
subgraph clusterRegular {
8+
label = "Program Modules"
9+
node [color="#caecec"]
10+
"Hero"
11+
}
12+
subgraph clusterTest {
13+
label = "Test Modules"
14+
node [color="#aaccee"]
15+
"HeroTests"
16+
}
17+
subgraph clusterExternal {
18+
label = "External Dependencies"
19+
node [color="#eeccaa"]
20+
""
21+
}
22+
23+
"HeroTests" -> ""
24+
}

Sources/HeroContext.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,6 @@ extension HeroContext {
140140

141141
unhide(view: view)
142142

143-
// capture a snapshot without alpha, cornerRadius, or shadows
144-
let oldMaskedCorners: CACornerMask = {
145-
if #available(iOS 11, tvOS 11, *) {
146-
return view.layer.maskedCorners
147-
} else {
148-
return []
149-
}
150-
}()
151143
let oldCornerRadius = view.layer.cornerRadius
152144
let oldAlpha = view.alpha
153145
let oldShadowRadius = view.layer.shadowRadius
@@ -229,7 +221,12 @@ extension HeroContext {
229221
}
230222
#endif
231223

232-
if #available(iOS 11, tvOS 11, *) {
224+
if #available(iOSApplicationExtension 11.0, tvOSApplicationExtension 11.0, iOS 11, tvOS 11, *) {
225+
// capture a snapshot without alpha, cornerRadius, or shadows
226+
let oldMaskedCorners: CACornerMask = {
227+
return view.layer.maskedCorners
228+
}()
229+
233230
view.layer.maskedCorners = oldMaskedCorners
234231
}
235232
view.layer.cornerRadius = oldCornerRadius

docs/Classes.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<header class="header">
2222
<p class="header-col header-col--primary">
2323
<a class="header-link" href="index.html">
24-
Hero 1.6.3 Docs
24+
Hero 1.6.4 Docs
2525
</a>
2626
(24% documented)
2727
</p>
@@ -781,7 +781,7 @@ <h4>Declaration</h4>
781781
</div>
782782
<section class="footer">
783783
<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>
784-
<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>
784+
<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>
785785
</section>
786786
</body>
787787
</html>

0 commit comments

Comments
 (0)