From 422769e50512dda4c24a4f3826ee728e747e0f29 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Mon, 4 Mar 2024 17:56:18 +0100 Subject: [PATCH 1/6] Add missing unreleased tag in changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ce55fa..e7b161a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## [Unreleased] + ### Changed - Bump ADUtils requirements to 12+ From e8c82527846de085251acda80a8e31ff53183db7 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Mon, 4 Mar 2024 17:56:26 +0100 Subject: [PATCH 2/6] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7b161a..da08660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## [Unreleased] +## [2.0.0] - 2024-03-04Z + ### Changed - Bump ADUtils requirements to 12+ From 2f24b0f236705949ee1cb63ec632fc785f29acfc Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Mon, 4 Mar 2024 17:56:26 +0100 Subject: [PATCH 3/6] Bump to 2.0.0 --- ADNavigationBarExtension.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ADNavigationBarExtension.podspec b/ADNavigationBarExtension.podspec index 34a2216..5f31aec 100644 --- a/ADNavigationBarExtension.podspec +++ b/ADNavigationBarExtension.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'ADNavigationBarExtension' - s.version = '1.0.4' + s.version = '2.0.0' s.author = 'Fabernovel Technologies' s.homepage = 'https://fabernovel.com/' s.summary = 'ADNavigationBarExtension is a UI library written in Swift to show and hide an extension to your UINavigationBar' From 17ecc4116d8f19020c04b4e54187b96f53619e51 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Mon, 4 Mar 2024 17:58:09 +0100 Subject: [PATCH 4/6] Fix Timestamp in changelog --- CHANGELOG.md | 2 +- fastlane/Fastfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da08660..52a2e52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## [Unreleased] -## [2.0.0] - 2024-03-04Z +## [2.0.0] - 2024-03-04 ### Changed - Bump ADUtils requirements to 12+ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d2b7478..2b6b7bb 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -83,7 +83,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) From ec78af9692ab9bfe7ff67f013f8ecb27faf343e6 Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Tue, 5 Mar 2024 09:38:37 +0100 Subject: [PATCH 5/6] Use correct personal github access token in CD --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index abe7cd2..92241e0 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,6 +20,6 @@ jobs: - name: Publish release env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN_CI }} COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TOKEN_CI }} run: bundle exec fastlane publish_release From 3bbded2d3bedbd8d891d253a308548133f14765a Mon Sep 17 00:00:00 2001 From: Alexandre Podlewski Date: Tue, 5 Mar 2024 09:43:33 +0100 Subject: [PATCH 6/6] Update Podfile.lock and fix Fastfile to do it next time --- Podfile.lock | 4 ++-- fastlane/Fastfile | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index d6c2555..106aea5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - ADNavigationBarExtension (1.0.4): + - ADNavigationBarExtension (2.0.0): - ADUtils (~> 12.0) - ADUtils (12.1.1): - ADUtils/objc (= 12.1.1) @@ -23,7 +23,7 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - ADNavigationBarExtension: 7bb3042ea4375225682979774a787ec760a6e22f + ADNavigationBarExtension: 1be9d794fb7715b7d1bfa5158ddcabe176ffb769 ADUtils: a3e9fdcfe76222dd3abfa4659ad1e8249ed16c95 SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 2b6b7bb..4e31722 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -101,9 +101,12 @@ def bump_podspec(target_version) version_number: target_version ) - git_add(path: podspec_path) + pod_install # update the Podfile.lock with the new version + + path = [podspec_path, "Podfile.lock"] + git_add(path: path) git_commit( - path: podspec_path, + path: path, message: "Bump to #{target_version}" ) end