diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3021ef6..0cfe3a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,29 @@ jobs: - 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 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 diff --git a/ADNavigationBarExtension.podspec b/ADNavigationBarExtension.podspec index f51703e..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' @@ -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/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 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; 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..d934615 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): + - ADNavigationBarExtension (1.0.1): + - 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: 0919d4229f2de09054d022abfdb81812857408fe + ADUtils: 5f5f1ad7a097dcf7104f9c160bc23a30d7943eb8 SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447 -PODFILE CHECKSUM: 1b201e7fe3b5c6a52049e213c8e739b46201e30c +PODFILE CHECKSUM: 680a1e183edb00544c8954221900e5976c9977fe COCOAPODS: 1.8.3