diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index bf8d0cf..84255a2 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,6 +1,9 @@ name: CD -on: workflow_dispatch +on: + push: + branches: + - master jobs: build: diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 36ecbda..7370b4e 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -14,7 +14,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.5 + ruby-version: 3.0.6 - name: Bundle install run: bundle install diff --git a/ADKeyboardManager.podspec b/ADKeyboardManager.podspec index 4be8062..95c11e4 100644 --- a/ADKeyboardManager.podspec +++ b/ADKeyboardManager.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'ADKeyboardManager' - spec.version = '6.0.0' + spec.version = '7.0.0' spec.authors = 'Applidium' spec.license = 'none' spec.homepage = 'http://applidium.com' @@ -11,5 +11,5 @@ Pod::Spec.new do |spec| spec.source_files = 'Classes/*.swift' spec.framework = 'Foundation', 'UIKit' spec.requires_arc = true - spec.swift_version = '5.0' + spec.swift_version = '5.6' end diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d0c583..14abff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [7.0.0] - 2023-09-26 + ### Added - Add support for Swift Package Manager @@ -12,6 +14,7 @@ All notable changes to this project will be documented in this file. ### Removed - Drop support for iOS version below iOS 12.0 +- Drop support for Swift version below 5.6 ### Fixed diff --git a/KeyboardManagerDemo/Podfile.lock b/KeyboardManagerDemo/Podfile.lock index 3ca21d6..f63126c 100644 --- a/KeyboardManagerDemo/Podfile.lock +++ b/KeyboardManagerDemo/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - ADKeyboardManager (6.0.0) + - ADKeyboardManager (7.0.0) - ADUtils (11.3.0): - ADUtils/objc (= 11.3.0) - ADUtils/objc (11.3.0): @@ -17,18 +17,17 @@ DEPENDENCIES: - SwiftLint (~> 0.38) SPEC REPOS: - https://github.com/CocoaPods/Specs.git: - - SwiftLint trunk: - ADUtils - CocoaLumberjack + - SwiftLint EXTERNAL SOURCES: ADKeyboardManager: :path: "../" SPEC CHECKSUMS: - ADKeyboardManager: 61fec89efc0c1b67ed713125ff2abd6a115ffaea + ADKeyboardManager: bb6558207259e9902c6d8d03fb08c64dbd620a55 ADUtils: 094de41bd0d4b1ea6f620a62e87fa6dded0bad7b CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732 SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447 diff --git a/MAINTAINER.md b/MAINTAINER.md new file mode 100644 index 0000000..771dc37 --- /dev/null +++ b/MAINTAINER.md @@ -0,0 +1,7 @@ + +## How to release a version + +- Create & push a release branch `release/vA.B.C` -> the prepare_release action will automatically create the PR to merge this release into master and develop. +- Run `bundle exec fastlane prepare_release` to update the changelog and Podfile.lock +- Merge the PR into master -> the CI action will trigger a pod release and tag the commit +- Once the PR into master is merged, merge the branch `release/vA.B.C` into develop diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3c0240c..99926a3 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -80,7 +80,8 @@ def update_changelog(target_version) changelog_path = ENV["CHANGELOG"] stamp_changelog( changelog_path: changelog_path, - section_identifier: "#{target_version}" + section_identifier: "#{target_version}", + stamp_datetime_format: '%F' ) git_add(path: changelog_path) @@ -99,7 +100,7 @@ def bump_podspec(target_version) pod_install # update the Podfile.lock with the new version - path = [podspec_path, "Podfile.lock"] + path = [podspec_path, "KeyboardManagerDemo/Podfile.lock"] git_add(path: path) git_commit( path: path, @@ -112,7 +113,7 @@ def target_version_from_branch end def pod_install - sh "pushd KeyboardManagerDemo" - sh "bundle exec pod install" - sh "popd" + Dir.chdir "../KeyboardManagerDemo" do + sh "bundle exec pod install" + end end