From 9831beb1b0577c8aac354e16643e0efbb605b866 Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 08:20:14 +0100 Subject: [PATCH 1/6] Bump adutils --- .github/workflows/ci.yml | 9 ++++----- ADNavigationBarExtension.podspec | 2 +- Podfile | 2 +- Podfile.lock | 18 +++++++++--------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3021ef6..8e0b9be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,10 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.6.5 - - name: Bundle install - run: bundle install + - name: Set ruby version + run: RUBY_VERSION=$(~/.rbenv/plugins/rbenv-bundler-ruby-version/bin/rbenv-bundler-ruby-version) && rbenv install -s $RUBY_VERSION + - name: Install bundler + run: gem install bundler - name: Pod install run: bundle exec pod install - name: Build and test diff --git a/ADNavigationBarExtension.podspec b/ADNavigationBarExtension.podspec index f51703e..3c65411 100644 --- a/ADNavigationBarExtension.podspec +++ b/ADNavigationBarExtension.podspec @@ -21,5 +21,5 @@ Pod::Spec.new do |s| s.source_files = 'NavigationBarExtension/Classes/**/*' s.frameworks = 'UIKit' - s.dependency 'ADUtils', '~> 10.1' + s.dependency 'ADUtils', '~> 11.0' end diff --git a/Podfile b/Podfile index 9c24020..800aec9 100644 --- a/Podfile +++ b/Podfile @@ -4,7 +4,7 @@ platform :ios, '11.0' target 'NavigationBarExtension_Example' do pod 'ADNavigationBarExtension', :path => './' - pod 'ADUtils', '~> 10.1' + pod 'ADUtils', '~> 11.0' pod 'SwiftLint', '~> 0.39.1' target 'NavigationBarExtension_Tests' do diff --git a/Podfile.lock b/Podfile.lock index 0735ca8..3265b04 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,16 +1,16 @@ PODS: - ADNavigationBarExtension (1.0.0): - - ADUtils (~> 10.1) - - ADUtils (10.1.0): - - ADUtils/objc (= 10.1.0) - - ADUtils/objc (10.1.0): + - ADUtils (~> 11.0) + - ADUtils (11.0.0): + - ADUtils/objc (= 11.0.0) + - ADUtils/objc (11.0.0): - ADUtils/Swift - - ADUtils/Swift (10.1.0) + - ADUtils/Swift (11.0.0) - SwiftLint (0.39.2) DEPENDENCIES: - ADNavigationBarExtension (from `./`) - - ADUtils (~> 10.1) + - ADUtils (~> 11.0) - SwiftLint (~> 0.39.1) SPEC REPOS: @@ -23,10 +23,10 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - ADNavigationBarExtension: fd112ff41a07f872a7396d3998ac50ccfe0ae68b - ADUtils: a88c87c869e8166f3ebdb9523b6940936f7c819a + ADNavigationBarExtension: 8fb99087e2fb26d9884bec2cb86b96eb38d5aa32 + ADUtils: 5f5f1ad7a097dcf7104f9c160bc23a30d7943eb8 SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447 -PODFILE CHECKSUM: 1b201e7fe3b5c6a52049e213c8e739b46201e30c +PODFILE CHECKSUM: 680a1e183edb00544c8954221900e5976c9977fe COCOAPODS: 1.8.3 From 1ee09b42b3a7d0c8349fb5609105c620dd0521c7 Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 08:22:17 +0100 Subject: [PATCH 2/6] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f811edc..e2d3982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +## [1.0.1] + +### Update +- update ADUtils + ## [1.0.0] ### Fixed From c887bf9773dbc4dfa63d7081d194192a2c77e68b Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 08:23:22 +0100 Subject: [PATCH 3/6] Bump 1.0.1 --- ADNavigationBarExtension.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ADNavigationBarExtension.podspec b/ADNavigationBarExtension.podspec index 3c65411..0773bbd 100644 --- a/ADNavigationBarExtension.podspec +++ b/ADNavigationBarExtension.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'ADNavigationBarExtension' - s.version = '1.0.0' + s.version = '1.0.1' s.author = 'Fabernovel Technologies' s.homepage = 'https://technologies.fabernovel.com/' s.summary = 'ADNavigationBarExtension is a UI library written in Swift to show and hide an extension to your UINavigationBar' From 2c7f1a296895dd00f82e83af46dc1523ad5ad6d8 Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 08:23:50 +0100 Subject: [PATCH 4/6] Update dev pod --- Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 3265b04..d934615 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - ADNavigationBarExtension (1.0.0): + - ADNavigationBarExtension (1.0.1): - ADUtils (~> 11.0) - ADUtils (11.0.0): - ADUtils/objc (= 11.0.0) @@ -23,7 +23,7 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - ADNavigationBarExtension: 8fb99087e2fb26d9884bec2cb86b96eb38d5aa32 + ADNavigationBarExtension: 0919d4229f2de09054d022abfdb81812857408fe ADUtils: 5f5f1ad7a097dcf7104f9c160bc23a30d7943eb8 SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447 From 702b96dccdef4b939fbbac57bbb838f113cd032d Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 08:36:27 +0100 Subject: [PATCH 5/6] Update github actions --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++----- .github/workflows/prepare_release.yml | 22 -------------------- 2 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/prepare_release.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e0b9be..0cfe3a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,12 +12,32 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set ruby version - run: RUBY_VERSION=$(~/.rbenv/plugins/rbenv-bundler-ruby-version/bin/rbenv-bundler-ruby-version) && rbenv install -s $RUBY_VERSION - - name: Install bundler - run: gem install bundler + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6.5 + + - name: Ruby cache + uses: actions/cache@v1 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + - name: Bundle install + run: | + bundle config path vendor/bundle + bundle check || bundle install + - name: Pods cache + uses: actions/cache@v1 + with: + path: Pods + key: ${{ runner.os }}-cocoapods-${{ hashFiles('**/Podfile.lock') }} + - name: Pod install - run: bundle exec pod install + run: | + if [ ! -d "Pods" ]; then + bundle exec pod install + fi - name: Build and test run: bundle exec fastlane ci_check - name: Pod lib lint diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml deleted file mode 100644 index 03505a2..0000000 --- a/.github/workflows/prepare_release.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Create release PRs - -on: - create - -jobs: - build: - - runs-on: macOS-latest - - if: contains(github.ref, 'release') # allow to filter on release branches only - steps: - - uses: actions/checkout@v2 - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.6.5 - - name: Bundle install - run: bundle install - - name: Prepare release - env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }} - run: bundle exec fastlane create_release_pr From 3e7f4095e7a4d4ca0c72d2f7f223c760c78c386d Mon Sep 17 00:00:00 2001 From: Samuel Gallet Date: Thu, 10 Dec 2020 09:14:03 +0100 Subject: [PATCH 6/6] Remove swiftling build phase --- .../project.pbxproj | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/NavigationBarExtension.xcodeproj/project.pbxproj b/NavigationBarExtension.xcodeproj/project.pbxproj index 22c3524..ca940ef 100644 --- a/NavigationBarExtension.xcodeproj/project.pbxproj +++ b/NavigationBarExtension.xcodeproj/project.pbxproj @@ -193,7 +193,6 @@ buildPhases = ( 2791622B06362A6507B006C9 /* [CP] Check Pods Manifest.lock */, 607FACCC1AFB9204008FA782 /* Sources */, - 0CE0BAB024A0B06F00F00448 /* Swiftlint */, 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, 3DDDF70962B4934782466AD9 /* [CP] Embed Pods Frameworks */, @@ -292,24 +291,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0CE0BAB024A0B06F00F00448 /* Swiftlint */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = Swiftlint; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n"; - }; 2791622B06362A6507B006C9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647;