Skip to content

Commit efa7096

Browse files
committed
Merge branch 'release/1.6.1'
2 parents e787359 + 44e9a75 commit efa7096

File tree

118 files changed

+1762
-1943
lines changed

Some content is hidden

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

118 files changed

+1762
-1943
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,4 @@ _book
7171
xcodebuild.log
7272
.swiftpm
7373
/.bundle
74+
*.zip

.jazzy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ---- About ----
22
module: Hero
3-
module_version: 1.6.0
3+
module_version: 1.6.1
44
author: HeroTransitions
55
readme: README.md
66
copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'
@@ -9,7 +9,7 @@ copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/L
99
author_url: https://herotransitions.github.io/Hero/
1010
dash_url: https://herotransitions.github.io/Hero/docsets/Hero.xml
1111
github_url: https://github.com/HeroTransitions/Hero/
12-
github_file_prefix: https://github.com/HeroTransitions/Hero/tree/1.6.0/
12+
github_file_prefix: https://github.com/HeroTransitions/Hero/tree/1.6.1/
1313

1414
# ---- Sources ----
1515
podspec: Hero.podspec

CHANGELOG.md

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

55
--------------------------------------
6+
## [1.6.1](https://github.com/HeroTransitions/Hero/releases/tag/1.6.1)
7+
8+
### Added
9+
10+
- git ignore .zip files
11+
12+
### Changed
13+
14+
- closes #703 Move CI depends to Mint
15+
### Fixed
16+
17+
- Update README.md remove dead link closes #708
18+
- Update the link to material design's motion duration easing links.
19+
- fixes #704 SPM missing imports
620

721
## [1.6.0](https://github.com/HeroTransitions/Hero/releases/tag/1.6.0)
822
### Added
@@ -14,6 +28,7 @@ The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransit
1428
- #595 - Add Accio supported badge
1529
- #619 - XCode 11/12 support in example
1630
- CI/CD improvements
31+
1732
### Changed
1833

1934
- #648 - Updated iOS version support

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

88
s.description = <<-DESC

Hero.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@
12011201
"@executable_path/Frameworks",
12021202
"@loader_path/Frameworks",
12031203
);
1204-
MARKETING_VERSION = 1.6.0;
1204+
MARKETING_VERSION = 1.6.1;
12051205
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
12061206
PRODUCT_NAME = Hero;
12071207
SDKROOT = appletvos;
@@ -1233,7 +1233,7 @@
12331233
"@executable_path/Frameworks",
12341234
"@loader_path/Frameworks",
12351235
);
1236-
MARKETING_VERSION = 1.6.0;
1236+
MARKETING_VERSION = 1.6.1;
12371237
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
12381238
PRODUCT_NAME = Hero;
12391239
SDKROOT = appletvos;
@@ -1259,7 +1259,7 @@
12591259
"$(inherited)",
12601260
"@executable_path/Frameworks",
12611261
);
1262-
MARKETING_VERSION = 1.6.0;
1262+
MARKETING_VERSION = 1.6.1;
12631263
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
12641264
PRODUCT_NAME = "$(TARGET_NAME)";
12651265
SDKROOT = appletvos;
@@ -1282,7 +1282,7 @@
12821282
"$(inherited)",
12831283
"@executable_path/Frameworks",
12841284
);
1285-
MARKETING_VERSION = 1.6.0;
1285+
MARKETING_VERSION = 1.6.1;
12861286
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
12871287
PRODUCT_NAME = "$(TARGET_NAME)";
12881288
SDKROOT = appletvos;
@@ -1315,7 +1315,7 @@
13151315
"@executable_path/Frameworks",
13161316
"@loader_path/Frameworks",
13171317
);
1318-
MARKETING_VERSION = 1.6.0;
1318+
MARKETING_VERSION = 1.6.1;
13191319
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
13201320
PRODUCT_NAME = Hero;
13211321
SKIP_INSTALL = YES;
@@ -1347,7 +1347,7 @@
13471347
"@executable_path/Frameworks",
13481348
"@loader_path/Frameworks",
13491349
);
1350-
MARKETING_VERSION = 1.6.0;
1350+
MARKETING_VERSION = 1.6.1;
13511351
PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
13521352
PRODUCT_NAME = Hero;
13531353
SKIP_INSTALL = YES;
@@ -1486,7 +1486,7 @@
14861486
"$(inherited)",
14871487
"@executable_path/Frameworks",
14881488
);
1489-
MARKETING_VERSION = 1.6.0;
1489+
MARKETING_VERSION = 1.6.1;
14901490
OTHER_LDFLAGS = (
14911491
"$(inherited)",
14921492
"-framework",
@@ -1519,7 +1519,7 @@
15191519
"$(inherited)",
15201520
"@executable_path/Frameworks",
15211521
);
1522-
MARKETING_VERSION = 1.6.0;
1522+
MARKETING_VERSION = 1.6.1;
15231523
OTHER_LDFLAGS = (
15241524
"$(inherited)",
15251525
"-framework",

Mintfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# yonaskolb/xcodegen
2+
realm/SwiftLint # Linting Tool
3+
danger/swift.git
4+
nicklockwood/SwiftFormat
5+
# orta/Komondor

Package.resolved

Lines changed: 0 additions & 187 deletions
This file was deleted.

Package.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33

44
import PackageDescription
55

6-
let ciDependencies: [Package.Dependency] = [
7-
.package(url: "https://github.com/danger/swift.git", from: "1.0.0"),
8-
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"),
9-
.package(url: "https://github.com/Realm/SwiftLint", from: "0.28.1"),
10-
.package(url: "https://github.com/orta/Komondor", from: "1.0.0")]
11-
12-
let dependencies = ciDependencies
13-
146
let package = Package(
157
name: "Hero",
168
platforms: [
@@ -22,7 +14,6 @@ let package = Package(
2214
type: .dynamic,
2315
targets: ["Hero"]),
2416
],
25-
dependencies: dependencies,
2617
targets: [
2718
.target(name: "Hero", path: "Sources"),
2819
.testTarget(name: "HeroTests",

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,10 @@ At view controller level, Hero provides several template transitions that you ca
2525
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/defaultAnimations.svg"/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
2626
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/defaultAnimations2.svg"/>
2727

28-
By default, Hero provides **dynamic duration** based on the [Material Design Motion Guide](https://material.io/guidelines/motion/duration-easing.html). Duration is automatically determined by changes to distance and size—saving you the hassle, while providing consistent and delightful animations.
28+
By default, Hero provides **dynamic duration** based on the [Material Design Motion Guide](https://material.io/design/motion/speed.html#easing). Duration is automatically determined by changes to distance and size—saving you the hassle, while providing consistent and delightful animations.
2929

3030
Hero doesn't make any assumptions about how the view is built or structured. It won't modify any of your views' states other than hiding them during the animation. This makes it work with **Auto Layout**, **programmatic layout**, **UICollectionView** (without modifying its layout object), **UITableView**, **UINavigationController**, **UITabBarController**, etc...
3131

32-
## Example Gallery
33-
34-
Checkout the [Example Gallery Blog Post](http://lkzhao.com/2016/12/28/hero.html) for a general idea of what you can achieve with **Hero**
35-
3632
## Usage Example 1
3733

3834
<img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/simple.svg" />
@@ -151,11 +147,11 @@ let package = Package(
151147
targets: ["MyPackage"]),
152148
],
153149
dependencies: [
154-
.package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.0"))
150+
.package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.1"))
155151
],
156152
targets: [
157153
.target(
158-
name: "MyPackage",
154+
name: "MyPackage",1.6.1
159155
dependencies: ["Hero"])
160156
]
161157
)

0 commit comments

Comments
 (0)