Skip to content

Commit

Permalink
Merge branch 'release/1.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeMatt committed Feb 6, 2024
2 parents 66a554b + ae8bb4d commit b307e2d
Show file tree
Hide file tree
Showing 120 changed files with 248 additions and 281 deletions.
26 changes: 20 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches:
branches:
- master
name: Build
jobs:
Expand All @@ -10,14 +10,28 @@ jobs:
strategy:
matrix:
destination: [
'platform=iOS Simulator,OS=12.4,name=iPhone X',
'platform=tvOS Simulator,OS=12.4,name=Apple TV 4']
'platform=Any iOS Simulator',
'platform=Any tvOS Simulator',
'platform=macOS,arch=x86_64',
'platform=macOS,arch=arm64',
'platform=macCatalyst,arch=x86_64',
'platform=macCatalyst,arch=arm64',
]
steps:
- name: Checkout
uses: actions/checkout@master
- name: Build
run: |
pod install
set -o pipefail && xcodebuild clean build -workspace Hero.xcworkspace -scheme Hero -destination "${destination}" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO
env:
destination: ${{ matrix.destination }}
set -o pipefail && \
xcodebuild clean build \
-workspace Hero.xcworkspace \
-scheme Hero \
-destination "${destination}" \
-parallelizeTargets -showBuildTimingSummary \
-enableCodeCoverage YES \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
| xcpretty
env:
destination: ${{ matrix.destination }}
112 changes: 40 additions & 72 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,98 +1,66 @@
# test.yml
# Unit Test
name: Unit Test

on:
'on':
pull_request:
paths:
- "**.swift"
- "**.xcodeproj"
- "**.m"
- "**.h"
- "**.podspec"
- "Podfile"
- "Podfile.lock"
- "test.yml"
- '**.swift'
- '**.xcodeproj'
- '**.m'
- '**.h'
- '**.podspec'
- Podfile
- Podfile.lock
- '**/test.yml'
jobs:
swiftpm:
name: Test iOS (swiftpm)
runs-on: macOS-latest
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
steps:
- name: Checkout
uses: actions/checkout@master
- name: iOS - Swift PM
run: |
pod install
set -o pipefail && swift test --parallel
iOS:
XCode:
name: Test iOS
runs-on: macOS-latest
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
strategy:
matrix:
destination: [
'platform=iOS Simulator,OS=14.4,name=iPhone 12'
]
matrix:
run-config:
- scheme: Hero
platform: iOS
action: test
code-coverage: true
- scheme: Hero (tvOS)
platform: tvOS
action: build
code-coverage: false
steps:
- name: Checkout
uses: actions/checkout@master

- name: iOS - ${{ matrix.destination }}
- name: CocoaPods - ${{ matrix.run-config.destination }}
run: |
pod install
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
bash <(curl -s https://codecov.io/bash)
env:
destination: ${{ matrix.destination }}
- name: Upload Code Coverage
run: |
bash <(curl -s https://codecov.io/bash)
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# iOS-legacy:
# name: Test iOS
# runs-on: macOS-latest
# env:
# DEVELOPER_DIR: /Applications/Xcode_10.3.1.app/Contents/Developer
# strategy:
# matrix:
# destination: [
# 'platform=iOS Simulator,OS=10.3.1,name=iPhone 7'
# ]
# steps:
# - name: Checkout
# uses: actions/checkout@master
# - name: iOS - ${{ matrix.destination }}
# run: |
# xcversion simulators --install='iOS 10.3.1'
# pod install
# 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
# bash <(curl -s https://codecov.io/bash)
# env:
# destination: ${{ matrix.destination }}
# - name: Upload Code Coverage
# run: |
# bash <(curl -s https://codecov.io/bash)
# env:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
tvOS:
name: Test tvOS
runs-on: macOS-latest
env:
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
strategy:
matrix:
destination: [
'platform=tvOS Simulator,OS=14.3,name=Apple TV 4K'
]
steps:
- name: Checkout
uses: actions/checkout@master
- name: tvOS - ${{ matrix.destination }}
run: |
pod install
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
env:
destination: ${{ matrix.destination }}
- name: Test - ${{ matrix.run-config.platform }}
uses: mxcl/[email protected]
with:
platform: ${{ matrix.run-config.platform }}
action: ${{ matrix.run-config.action }}
code-coverage: ${{ matrix.run-config.code-coverage }}
configuration: Debug
scheme: ${{ matrix.run-config.scheme }}
workspace: Hero.xcworkspace

- name: Upload Code Coverage
uses: codecov/codecov-action@v3
if: ${{ matrix.run-config.code-coverage }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
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.2
module_version: 1.6.3
author: HeroTransitions
readme: README.md
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'
Expand Down
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransitions/Hero/releases) on GitHub.

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

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

- 1ac98e7 Adaption for visionOS.
- 5e05761 Merge pull request #771 from HeroTransitions/feature/CICDFix
- c9a98cf CI/CI build and test, matrix platforms fix?
- 2f8096d build.yml test.yml update github runner env
- 45aed92 Readme add api docs link
- a7d2682 README.md update ios/xcode version badges
- 211df4b README.md Add unit test and swift pm action badges
- bff4221 swiftlint fix
- a47dce4 Merge pull request #749 from tadija/feature/xcode14-warnings
- fd2ba86 Fix lint warnings
- 5c053a6 Fix build warnings with Xcode 14.0

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

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

### Fixed
- Fixed shadows being cutoff by snapshots.
- Fixed shadows being cutoff by snapshots.
[#440](https://github.com/HeroTransitions/Hero/pull/440) by [@2blane](https://github.com/2blane)
- Fixed animation flickering on CALayer animation.
[f4dab9](https://github.com/HeroTransitions/Hero/commit/f4dab9ed2ab88ae065605199d5aca7706b07c2ad) by [@lkzhao](https://github.com/lkzhao)
19 changes: 19 additions & 0 deletions DEVELOP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Develop.md

## Releases

1. Make release brach `git-flow release start x.x.x`
2. Search find/replace current version in XCode project
3. Update `CHANGELOG.md`
4. Run swift lint autocorrect `make autocorrect`
5. Change version in `jazzy.yml`
6. Run `make jazzy`
7. Commit changes.
8. Create GitHub release
9. Create CocoaPods release
1. ` pod lib lint`
10. Finish release
1. `git-flow release finish x.x.x`
2. `git push --tags`
11. Public CocoaPod release
1. `pod trunk push`
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.2'
s.version = '1.6.3'
s.summary = 'Elegant transition library for iOS'

s.description = <<-DESC
Expand Down
12 changes: 3 additions & 9 deletions Hero.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 53;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -1201,7 +1201,6 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
PRODUCT_NAME = Hero;
SDKROOT = appletvos;
Expand Down Expand Up @@ -1233,7 +1232,6 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
PRODUCT_NAME = Hero;
SDKROOT = appletvos;
Expand All @@ -1259,7 +1257,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
Expand All @@ -1282,7 +1279,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
Expand Down Expand Up @@ -1315,7 +1311,6 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
PRODUCT_NAME = Hero;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1347,7 +1342,6 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
PRODUCT_NAME = Hero;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1409,6 +1403,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 1.6.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1464,6 +1459,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 1.6.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -1486,7 +1482,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down Expand Up @@ -1519,7 +1514,6 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.2;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 5c14933c915eeee6fbe5ecdd950d3da01c4a0a86

COCOAPODS: 1.10.1
COCOAPODS: 1.11.3
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
[![codecov](https://codecov.io/gh/HeroTransitions/Hero/branch/develop/graph/badge.svg)](https://codecov.io/gh/HeroTransitions/Hero)
[![Version](https://img.shields.io/cocoapods/v/Hero.svg?style=flat)](http://cocoapods.org/pods/Hero)
[![License](https://img.shields.io/cocoapods/l/Hero.svg?style=flat)](https://github.com/lkzhao/Hero/blob/master/LICENSE?raw=true)
![Xcode 9.0+](https://img.shields.io/badge/Xcode-9.0%2B-blue.svg)
![iOS 8.0+](https://img.shields.io/badge/iOS-8.0%2B-blue.svg)
![Xcode 10.0+](https://img.shields.io/badge/Xcode-10.0%2B-blue.svg)
![iOS 10.0+](https://img.shields.io/badge/iOS-10.0%2B-blue.svg)
![Swift 4.0+](https://img.shields.io/badge/Swift-4.0%2B-orange.svg)
[![中文 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)
[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=NT5F7Y2MPV7RE)

[![Unit Test](https://github.com/HeroTransitions/Hero/actions/workflows/test.yml/badge.svg)](https://github.com/HeroTransitions/Hero/actions/workflows/test.yml)
[![Swift PM](https://github.com/HeroTransitions/SwiftPMTest/actions/workflows/spm.yml/badge.svg)](https://github.com/HeroTransitions/SwiftPMTest/actions/workflows/spm.yml)

<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/features.svg"/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/features2.svg"/>

Expand Down Expand Up @@ -74,7 +77,7 @@ for cell in redCells {

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

<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardView.png" width="267px"/>
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardView.png" width="267px"/>
<img src="https://cdn.rawgit.com/lkzhao/Hero/master/Resources/storyboardViewController.png" width="267px"/>

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

Dash compatible API docs: https://HeroTransitions.github.io/Hero/

## Interactive Transition Tutorials

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

0 comments on commit b307e2d

Please sign in to comment.