Merge branch 'release/1.6.1'

HeroTransitions · Mar 7, 2021 · efa7096 · efa7096
2 parents e787359 + 44e9a75
commit efa7096
Show file tree

Hide file tree

Showing 118 changed files with 1,762 additions and 1,943 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,3 +71,4 @@ _book
 xcodebuild.log
 .swiftpm
 /.bundle
+*.zip
diff --git a/.jazzy.yaml b/.jazzy.yaml
@@ -1,6 +1,6 @@
 # ---- About ----
 module: Hero
-module_version: 1.6.0
+module_version: 1.6.1
 author: HeroTransitions
 readme: README.md
 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
 author_url: https://herotransitions.github.io/Hero/
 dash_url: https://herotransitions.github.io/Hero/docsets/Hero.xml
 github_url: https://github.com/HeroTransitions/Hero/
-github_file_prefix: https://github.com/HeroTransitions/Hero/tree/1.6.0/
+github_file_prefix: https://github.com/HeroTransitions/Hero/tree/1.6.1/
 
 # ---- Sources ----
 podspec: Hero.podspec

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,20 @@
 The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransitions/Hero/releases) on GitHub.
 
 --------------------------------------
+## [1.6.1](https://github.com/HeroTransitions/Hero/releases/tag/1.6.1)
+
+### Added
+
+- git ignore .zip files
+
+### Changed
+
+- closes #703 Move CI depends to Mint
+### Fixed
+
+- Update README.md remove dead link closes #708
+- Update the link to material design's motion duration easing links.
+- fixes #704 SPM missing imports
 
 ## [1.6.0](https://github.com/HeroTransitions/Hero/releases/tag/1.6.0)
 ### Added
@@ -14,6 +28,7 @@ The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransit
 - #595 - Add Accio supported badge
 - #619 - XCode 11/12 support in example
 - CI/CD improvements
+
 ### Changed
 
 - #648 - Updated iOS version support

diff --git a/Hero.podspec b/Hero.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name              = 'Hero'
-  s.version           = '1.6.0'
+  s.version           = '1.6.1'
   s.summary           = 'Elegant transition library for iOS'
 
   s.description       = <<-DESC

diff --git a/Hero.xcodeproj/project.pbxproj b/Hero.xcodeproj/project.pbxproj
@@ -1201,7 +1201,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
 				PRODUCT_NAME = Hero;
 				SDKROOT = appletvos;
@@ -1233,7 +1233,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
 				PRODUCT_NAME = Hero;
 				SDKROOT = appletvos;
@@ -1259,7 +1259,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1282,7 +1282,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.HeroTvOSExamples;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
@@ -1315,7 +1315,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
 				PRODUCT_NAME = Hero;
 				SKIP_INSTALL = YES;
@@ -1347,7 +1347,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lkzhao.Hero;
 				PRODUCT_NAME = Hero;
 				SKIP_INSTALL = YES;
@@ -1486,7 +1486,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -1519,7 +1519,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.6.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",

diff --git a/Mintfile b/Mintfile
@@ -0,0 +1,5 @@
+# yonaskolb/xcodegen
+realm/SwiftLint # Linting Tool
+danger/swift.git
+nicklockwood/SwiftFormat
+# orta/Komondor
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -3,14 +3,6 @@
 
 import PackageDescription
 
-let ciDependencies: [Package.Dependency] = [
-    .package(url: "https://github.com/danger/swift.git", from: "1.0.0"),
-    .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"),
-    .package(url: "https://github.com/Realm/SwiftLint", from: "0.28.1"),
-    .package(url: "https://github.com/orta/Komondor", from: "1.0.0")]
-
-let dependencies = ciDependencies
-
 let package = Package(
     name: "Hero",
     platforms: [
@@ -22,7 +14,6 @@ let package = Package(
                  type: .dynamic,
                  targets: ["Hero"]),
     ],
-    dependencies: dependencies,
     targets: [
         .target(name: "Hero", path: "Sources"),
         .testTarget(name: "HeroTests",

diff --git a/README.md b/README.md
@@ -25,14 +25,10 @@ At view controller level, Hero provides several template transitions that you ca
 <img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/defaultAnimations.svg"/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/defaultAnimations2.svg"/>
 
-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.
+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.
 
 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...
 
-## Example Gallery
-
-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**
-
 ## Usage Example 1
 
 <img src="https://cdn.rawgit.com/lkzhao/Hero/ebb3f2c/Resources/simple.svg" />
@@ -151,11 +147,11 @@ let package = Package(
             targets: ["MyPackage"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.0"))
+        .package(url: "https://github.com/HeroTransitions/Hero.git", .upToNextMajor(from: "1.6.1"))
     ],
     targets: [
         .target(
-            name: "MyPackage",
+            name: "MyPackage",1.6.1
             dependencies: ["Hero"])
     ]
 )