[pull] develop from HeroTransitions:develop

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches:    
+    branches:
       - master
 name: Build
 jobs:
@@ -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 }}

.github/workflows/test.yml

@@ -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/xcodebuild@v2.0
+        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 }}

.jazzy.yaml

@@ -1,6 +1,6 @@
 # ---- About ----
 module: Hero
-module_version: 1.6.2
+module_version: 1.6.4
 author: HeroTransitions
 readme: README.md
 copyright: 'See [license](https://github.com/HeroTransitions/Hero/blob/develop/LICENSE) for more details.'

.makefiles/ios.mk

@@ -187,7 +187,7 @@ test:
 
 #> Make a .zip package of frameworks
 package:
-	carthage build --no-skip-current --platform $(PLATFORM)
+	carthage build --no-skip-current --platform $(PLATFORM) --use-xcframeworks --cache-builds
 	carthage archive $(MODULE_NAME)
 
 #> tag and release to github
@@ -207,4 +207,3 @@ open:
 #> Setup the project, git-hooks etc
 init:
 	git config core.hooksPath .githooks
-

CHANGELOG.md

@@ -3,6 +3,25 @@
 The changelog for `Hero`. Also see the [releases](https://github.com/HeroTransitions/Hero/releases) on GitHub.
 
 --------------------------------------
+
+## [1.6.4](https://github.com/HeroTransitions/Hero/releases/tag/1.6.4)
+
+- Fix XCode 16
+
+## [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
@@ -92,7 +111,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)

DEVELOP.md

@@ -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`

Hero.podspec

@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name              = 'Hero'
-  s.version           = '1.6.2'
+  s.version           = '1.6.4'
   s.summary           = 'Elegant transition library for iOS'
 
   s.description       = <<-DESC

Hero.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -1409,6 +1403,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1464,6 +1459,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				MARKETING_VERSION = 1.6.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -1486,7 +1482,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -1519,7 +1514,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",

Makefile

@@ -23,7 +23,7 @@ jazzy:
 
 #> Markdown API using sourcedocs; https://github.com/eneko/SourceDocs
 sourcedocs:
-	@sourcedocs generate -clean --spm-module Hero --output-folder docs
+	@sourcedocs generate --clean --output-folder docs
 
 #> Run tests
 swift_test: