Merge branch 'release/1.0.1' into develop

faberNovel · Dec 10, 2020 · eb7153b · eb7153b
2 parents 9831beb + 3e7f409
commit eb7153b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 49 deletions.
diff --git 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
diff --git 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'

diff --git 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
@@ -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.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