Skip to content

Commit b307e2d

Browse files
committed
Merge branch 'release/1.6.3'
2 parents 66a554b + ae8bb4d commit b307e2d

File tree

120 files changed

+248
-281
lines changed

Some content is hidden

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

120 files changed

+248
-281
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches:
3+
branches:
44
- master
55
name: Build
66
jobs:
@@ -10,14 +10,28 @@ jobs:
1010
strategy:
1111
matrix:
1212
destination: [
13-
'platform=iOS Simulator,OS=12.4,name=iPhone X',
14-
'platform=tvOS Simulator,OS=12.4,name=Apple TV 4']
13+
'platform=Any iOS Simulator',
14+
'platform=Any tvOS Simulator',
15+
'platform=macOS,arch=x86_64',
16+
'platform=macOS,arch=arm64',
17+
'platform=macCatalyst,arch=x86_64',
18+
'platform=macCatalyst,arch=arm64',
19+
]
1520
steps:
1621
- name: Checkout
1722
uses: actions/checkout@master
1823
- name: Build
1924
run: |
2025
pod install
21-
set -o pipefail && xcodebuild clean build -workspace Hero.xcworkspace -scheme Hero -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
22-
env:
23-
destination: ${{ matrix.destination }}
26+
set -o pipefail && \
27+
xcodebuild clean build \
28+
-workspace Hero.xcworkspace \
29+
-scheme Hero \
30+
-destination "${destination}" \
31+
-parallelizeTargets -showBuildTimingSummary \
32+
-enableCodeCoverage YES \
33+
CODE_SIGN_IDENTITY="" \
34+
CODE_SIGNING_REQUIRED=NO \
35+
| xcpretty
36+
env:
37+
destination: ${{ matrix.destination }}

.github/workflows/test.yml

Lines changed: 40 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,66 @@
1+
# test.yml
2+
# Unit Test
13
name: Unit Test
2-
3-
on:
4+
'on':
45
pull_request:
56
paths:
6-
- "**.swift"
7-
- "**.xcodeproj"
8-
- "**.m"
9-
- "**.h"
10-
- "**.podspec"
11-
- "Podfile"
12-
- "Podfile.lock"
13-
- "test.yml"
7+
- '**.swift'
8+
- '**.xcodeproj'
9+
- '**.m'
10+
- '**.h'
11+
- '**.podspec'
12+
- Podfile
13+
- Podfile.lock
14+
- '**/test.yml'
1415
jobs:
1516
swiftpm:
1617
name: Test iOS (swiftpm)
1718
runs-on: macOS-latest
1819
env:
19-
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
20+
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
2021
steps:
2122
- name: Checkout
2223
uses: actions/checkout@master
2324
- name: iOS - Swift PM
2425
run: |
2526
pod install
2627
set -o pipefail && swift test --parallel
27-
iOS:
28+
XCode:
2829
name: Test iOS
2930
runs-on: macOS-latest
3031
env:
31-
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
32+
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
3233
strategy:
33-
matrix:
34-
destination: [
35-
'platform=iOS Simulator,OS=14.4,name=iPhone 12'
36-
]
34+
matrix:
35+
run-config:
36+
- scheme: Hero
37+
platform: iOS
38+
action: test
39+
code-coverage: true
40+
- scheme: Hero (tvOS)
41+
platform: tvOS
42+
action: build
43+
code-coverage: false
3744
steps:
3845
- name: Checkout
3946
uses: actions/checkout@master
4047

41-
- name: iOS - ${{ matrix.destination }}
48+
- name: CocoaPods - ${{ matrix.run-config.destination }}
4249
run: |
4350
pod install
44-
set -o pipefail && xcodebuild clean test -workspace Hero.xcworkspace -scheme Hero -destination "${destination}" -configuration "Debug" -showBuildTimingSummary -enableThreadSanitizer YES -enableCodeCoverage YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=YES | xcpretty
45-
bash <(curl -s https://codecov.io/bash)
46-
env:
47-
destination: ${{ matrix.destination }}
48-
- name: Upload Code Coverage
49-
run: |
50-
bash <(curl -s https://codecov.io/bash)
51-
env:
52-
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
53-
# iOS-legacy:
54-
# name: Test iOS
55-
# runs-on: macOS-latest
56-
# env:
57-
# DEVELOPER_DIR: /Applications/Xcode_10.3.1.app/Contents/Developer
58-
# strategy:
59-
# matrix:
60-
# destination: [
61-
# 'platform=iOS Simulator,OS=10.3.1,name=iPhone 7'
62-
# ]
63-
# steps:
64-
# - name: Checkout
65-
# uses: actions/checkout@master
66-
# - name: iOS - ${{ matrix.destination }}
67-
# run: |
68-
# xcversion simulators --install='iOS 10.3.1'
69-
# pod install
70-
# set -o pipefail && xcodebuild clean test -workspace Hero.xcworkspace -scheme Hero -destination "${destination}" -parallelizeTargets -showBuildTimingSummary -enableThreadSanitizer YES -enableCodeCoverage YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO | xcpretty
71-
# bash <(curl -s https://codecov.io/bash)
72-
# env:
73-
# destination: ${{ matrix.destination }}
74-
# - name: Upload Code Coverage
75-
# run: |
76-
# bash <(curl -s https://codecov.io/bash)
77-
# env:
78-
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
79-
tvOS:
80-
name: Test tvOS
81-
runs-on: macOS-latest
82-
env:
83-
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
84-
strategy:
85-
matrix:
86-
destination: [
87-
'platform=tvOS Simulator,OS=14.3,name=Apple TV 4K'
88-
]
8951
90-
steps:
91-
- name: Checkout
92-
uses: actions/checkout@master
93-
- name: tvOS - ${{ matrix.destination }}
94-
run: |
95-
pod install
96-
set -o pipefail && xcodebuild clean build -workspace Hero.xcworkspace -scheme "Hero (tvOS)" -destination "${destination}" -parallelizeTargets -showBuildTimingSummary -enableThreadSanitizer YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=YES | xcpretty
97-
env:
98-
destination: ${{ matrix.destination }}
52+
- name: Test - ${{ matrix.run-config.platform }}
53+
uses: mxcl/[email protected]
54+
with:
55+
platform: ${{ matrix.run-config.platform }}
56+
action: ${{ matrix.run-config.action }}
57+
code-coverage: ${{ matrix.run-config.code-coverage }}
58+
configuration: Debug
59+
scheme: ${{ matrix.run-config.scheme }}
60+
workspace: Hero.xcworkspace
61+
62+
- name: Upload Code Coverage
63+
uses: codecov/codecov-action@v3
64+
if: ${{ matrix.run-config.code-coverage }}
65+
with:
66+
token: ${{ secrets.CODECOV_TOKEN }}

.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.2
3+
module_version: 1.6.3
44
author: HeroTransitions
55
readme: README.md
66
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@
33
The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransitions/Hero/releases) on GitHub.
44

55
--------------------------------------
6+
7+
## [1.6.3](https://github.com/HeroTransitions/Hero/releases/tag/1.6.3)
8+
9+
- 1ac98e7 Adaption for visionOS.
10+
- 5e05761 Merge pull request #771 from HeroTransitions/feature/CICDFix
11+
- c9a98cf CI/CI build and test, matrix platforms fix?
12+
- 2f8096d build.yml test.yml update github runner env
13+
- 45aed92 Readme add api docs link
14+
- a7d2682 README.md update ios/xcode version badges
15+
- 211df4b README.md Add unit test and swift pm action badges
16+
- bff4221 swiftlint fix
17+
- a47dce4 Merge pull request #749 from tadija/feature/xcode14-warnings
18+
- fd2ba86 Fix lint warnings
19+
- 5c053a6 Fix build warnings with Xcode 14.0
20+
621
## [1.6.2](https://github.com/HeroTransitions/Hero/releases/tag/1.6.2)
722

823
### Fixed
@@ -92,7 +107,7 @@ The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransit
92107
[#430](https://github.com/HeroTransitions/Hero/pull/430) by [@bradphilips](https://github.com/bradphilips)
93108

94109
### Fixed
95-
- Fixed shadows being cutoff by snapshots.
110+
- Fixed shadows being cutoff by snapshots.
96111
[#440](https://github.com/HeroTransitions/Hero/pull/440) by [@2blane](https://github.com/2blane)
97112
- Fixed animation flickering on CALayer animation.
98113
[f4dab9](https://github.com/HeroTransitions/Hero/commit/f4dab9ed2ab88ae065605199d5aca7706b07c2ad) by [@lkzhao](https://github.com/lkzhao)

DEVELOP.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Develop.md
2+
3+
## Releases
4+
5+
1. Make release brach `git-flow release start x.x.x`
6+
2. Search find/replace current version in XCode project
7+
3. Update `CHANGELOG.md`
8+
4. Run swift lint autocorrect `make autocorrect`
9+
5. Change version in `jazzy.yml`
10+
6. Run `make jazzy`
11+
7. Commit changes.
12+
8. Create GitHub release
13+
9. Create CocoaPods release
14+
1. ` pod lib lint`
15+
10. Finish release
16+
1. `git-flow release finish x.x.x`
17+
2. `git push --tags`
18+
11. Public CocoaPod release
19+
1. `pod trunk push`

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.2'
5+
s.version = '1.6.3'
66
s.summary = 'Elegant transition library for iOS'
77

88
s.description = <<-DESC

Hero.xcodeproj/project.pbxproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 53;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -1201,7 +1201,6 @@
12011201
"@executable_path/Frameworks",
12021202
"@loader_path/Frameworks",
12031203
);
1204-
MARKETING_VERSION = 1.6.2;
12051204
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
12061205
PRODUCT_NAME = Hero;
12071206
SDKROOT = appletvos;
@@ -1233,7 +1232,6 @@
12331232
"@executable_path/Frameworks",
12341233
"@loader_path/Frameworks",
12351234
);
1236-
MARKETING_VERSION = 1.6.2;
12371235
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
12381236
PRODUCT_NAME = Hero;
12391237
SDKROOT = appletvos;
@@ -1259,7 +1257,6 @@
12591257
"$(inherited)",
12601258
"@executable_path/Frameworks",
12611259
);
1262-
MARKETING_VERSION = 1.6.2;
12631260
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
12641261
PRODUCT_NAME = "$(TARGET_NAME)";
12651262
SDKROOT = appletvos;
@@ -1282,7 +1279,6 @@
12821279
"$(inherited)",
12831280
"@executable_path/Frameworks",
12841281
);
1285-
MARKETING_VERSION = 1.6.2;
12861282
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
12871283
PRODUCT_NAME = "$(TARGET_NAME)";
12881284
SDKROOT = appletvos;
@@ -1315,7 +1311,6 @@
13151311
"@executable_path/Frameworks",
13161312
"@loader_path/Frameworks",
13171313
);
1318-
MARKETING_VERSION = 1.6.2;
13191314
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
13201315
PRODUCT_NAME = Hero;
13211316
SKIP_INSTALL = YES;
@@ -1347,7 +1342,6 @@
13471342
"@executable_path/Frameworks",
13481343
"@loader_path/Frameworks",
13491344
);
1350-
MARKETING_VERSION = 1.6.2;
13511345
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
13521346
PRODUCT_NAME = Hero;
13531347
SKIP_INSTALL = YES;
@@ -1409,6 +1403,7 @@
14091403
GCC_WARN_UNUSED_FUNCTION = YES;
14101404
GCC_WARN_UNUSED_VARIABLE = YES;
14111405
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1406+
MARKETING_VERSION = 1.6.3;
14121407
MTL_ENABLE_DEBUG_INFO = YES;
14131408
ONLY_ACTIVE_ARCH = YES;
14141409
SDKROOT = iphoneos;
@@ -1464,6 +1459,7 @@
14641459
GCC_WARN_UNUSED_FUNCTION = YES;
14651460
GCC_WARN_UNUSED_VARIABLE = YES;
14661461
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
1462+
MARKETING_VERSION = 1.6.3;
14671463
MTL_ENABLE_DEBUG_INFO = NO;
14681464
SDKROOT = iphoneos;
14691465
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1486,7 +1482,6 @@
14861482
"$(inherited)",
14871483
"@executable_path/Frameworks",
14881484
);
1489-
MARKETING_VERSION = 1.6.2;
14901485
OTHER_LDFLAGS = (
14911486
"$(inherited)",
14921487
"-framework",
@@ -1519,7 +1514,6 @@
15191514
"$(inherited)",
15201515
"@executable_path/Frameworks",
15211516
);
1522-
MARKETING_VERSION = 1.6.2;
15231517
OTHER_LDFLAGS = (
15241518
"$(inherited)",
15251519
"-framework",

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ SPEC CHECKSUMS:
1515

1616
PODFILE CHECKSUM: 5c14933c915eeee6fbe5ecdd950d3da01c4a0a86
1717

18-
COCOAPODS: 1.10.1
18+
COCOAPODS: 1.11.3

README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
[![codecov](https://codecov.io/gh/HeroTransitions/Hero/branch/develop/graph/badge.svg)](https://codecov.io/gh/HeroTransitions/Hero)
88
[![Version](https://img.shields.io/cocoapods/v/Hero.svg?style=flat)](http://cocoapods.org/pods/Hero)
99
[![License](https://img.shields.io/cocoapods/l/Hero.svg?style=flat)](https://github.com/lkzhao/Hero/blob/master/LICENSE?raw=true)
10-
![Xcode 9.0+](https://img.shields.io/badge/Xcode-9.0%2B-blue.svg)
11-
![iOS 8.0+](https://img.shields.io/badge/iOS-8.0%2B-blue.svg)
10+
![Xcode 10.0+](https://img.shields.io/badge/Xcode-10.0%2B-blue.svg)
11+
![iOS 10.0+](https://img.shields.io/badge/iOS-10.0%2B-blue.svg)
1212
![Swift 4.0+](https://img.shields.io/badge/Swift-4.0%2B-orange.svg)
1313
[![中文 README](https://img.shields.io/badge/%E4%B8%AD%E6%96%87-README-blue.svg?style=flat)](https://github.com/lkzhao/Hero/blob/master/README.zh-cn.md)
1414
[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NT5F7Y2MPV7RE)
1515

16+
[![Unit Test](https://github.com/HeroTransitions/Hero/actions/workflows/test.yml/badge.svg)](https://github.com/HeroTransitions/Hero/actions/workflows/test.yml)
17+
[![Swift PM](https://github.com/HeroTransitions/SwiftPMTest/actions/workflows/spm.yml/badge.svg)](https://github.com/HeroTransitions/SwiftPMTest/actions/workflows/spm.yml)
18+
1619
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/features.svg"/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
1720
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/features2.svg"/>
1821

@@ -74,7 +77,7 @@ for cell in redCells {
7477

7578
You can do these in the **storyboard** too!
7679

77-
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardView.png" width="267px"/>
80+
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardView.png" width="267px"/>
7881
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardViewController.png" width="267px"/>
7982

8083
## Installation
@@ -147,7 +150,7 @@ let package = Package(
147150
targets: ["MyPackage"]),
148151
],
149152
dependencies: [
150-
.package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.2"))
153+
.package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.3"))
151154
],
152155
targets: [
153156
.target(
@@ -168,6 +171,8 @@ Checkout the **[WIKI PAGES (Usage Guide)](https://github.com/lkzhao/Hero/wiki/Us
168171
For more up-to-date ones, please see the header-doc. (use **alt+click** in Xcode)
169172
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/headerDoc.png" width="521px"/>
170173

174+
Dash compatible API docs: https://HeroTransitions.github.io/Hero/
175+
171176
## Interactive Transition Tutorials
172177

173178
[Interactive transitions with Hero (Part 1)](https://lkzhao.gitbooks.io/hero/content/docs/InteractiveTransition.html)

0 commit comments

Comments
 (0)