Skip to content

Commit

Permalink
Merge pull request #15 from faberNovel/release/v7.0.0
Browse files Browse the repository at this point in the history
Release 7.0.0
  • Loading branch information
alexandre-pod authored Sep 26, 2023
2 parents 1fe69f6 + 9052efb commit 127f96e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 13 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: CD

on: workflow_dispatch
on:
push:
branches:
- master

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ADKeyboardManager.podspec
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
7 changes: 3 additions & 4 deletions KeyboardManagerDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions MAINTAINER.md
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
Expand All @@ -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

0 comments on commit 127f96e

Please sign in to comment.