NEVISACCESSAPP-6262: Update gem dependencies

nevissecurity · Nov 6, 2024 · 0b0d45c · 0b0d45c
1 parent 213f56b
commit 0b0d45c
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 92 deletions.
diff --git a/.github/actions/setup-ios/action.yml b/.github/actions/setup-ios/action.yml
@@ -15,3 +15,10 @@ runs:
         ruby-version: ${{ env.RUBY_VERSION }}
         bundler-cache: true
         working-directory: 'ios'
+
+    - name: Add Private Cocoapods Repo
+      if: ${{ env.BUILD_TYPE == 'SNAPSHOT' }}
+      shell: bash
+      run: |
+        pod repo remove ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY_NAME }} &> /dev/null || true
+        pod repo add ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY_NAME }} ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY_URL }}
diff --git a/.github/actions/setup-pub-credentials/action.yml b/.github/actions/setup-pub-credentials/action.yml
@@ -8,4 +8,4 @@ runs:
       shell: bash
       run: |
         echo Setting up Pub credentials...
-        echo '${{ env.PRIVATE_REPOSITORY_API_KEY }}' | dart pub token add ${{ env.PRIVATE_DART_REPOSITORY }}
+        echo '${{ env.PRIVATE_REPOSITORY_API_KEY }}' | dart pub token add ${{ env.PRIVATE_DART_REPOSITORY_URL }}
diff --git a/.github/actions/update-flutter-dependencies/action.yml b/.github/actions/update-flutter-dependencies/action.yml
@@ -17,7 +17,7 @@ runs:
         changes: |
           {
             "dependencies.nevis_mobile_authentication_sdk": "",
-            "dependencies.nevis_mobile_authentication_sdk.hosted": "${{ env.PRIVATE_DART_REPOSITORY }}",
+            "dependencies.nevis_mobile_authentication_sdk.hosted": "${{ env.PRIVATE_DART_REPOSITORY_URL }}",
             "dependencies.nevis_mobile_authentication_sdk.version": "${{ inputs.sdk-version }}"
           }
         commitChange: false
@@ -28,4 +28,4 @@ runs:
 
     - name: Resolve Flutter Packages
       shell: bash
-      run: flutter pub get
+      run: flutter pub get
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -22,9 +22,10 @@ env:
   RUBY_VERSION: '3.1'
   HOST_NAME: ${{ secrets.HOST_NAME }}
   PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }}
-  PRIVATE_DART_REPOSITORY: ${{ secrets.PRIVATE_DART_REPOSITORY }}
-  PRIVATE_NATIVE_IOS_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY }}
-  PRIVATE_NATIVE_ANDROID_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_ANDROID_REPOSITORY }}
+  PRIVATE_DART_REPOSITORY_URL: ${{ secrets.PRIVATE_DART_REPOSITORY_URL }}
+  PRIVATE_NATIVE_IOS_REPOSITORY_URL: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY_URL }}
+  PRIVATE_NATIVE_IOS_REPOSITORY_NAME: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY_NAME }}
+  PRIVATE_NATIVE_ANDROID_REPOSITORY_URL: ${{ secrets.PRIVATE_NATIVE_ANDROID_REPOSITORY_URL }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_USERNAME: ${{ secrets.GH_USERNAME }}
   GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -88,7 +89,7 @@ jobs:
 
       - name: Build And Distribute The iOS Example App
         env:
-          PRIVATE_NATIVE_REPOSITORY: ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY }}
+          PRIVATE_NATIVE_REPOSITORY_URL: ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY_URL }}
         uses: maierj/[email protected]
         with:
           lane: 'develop'
@@ -128,7 +129,7 @@ jobs:
 
       - name: Build And Distribute The Android Example App
         env:
-          PRIVATE_NATIVE_REPOSITORY: ${{ env.PRIVATE_NATIVE_ANDROID_REPOSITORY }}
+          PRIVATE_NATIVE_REPOSITORY_URL: ${{ env.PRIVATE_NATIVE_ANDROID_REPOSITORY_URL }}
         uses: maierj/[email protected]
         with:
           lane: 'develop'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,10 +24,6 @@ env:
   JAVA_VERSION: '17'
   RUBY_VERSION: '3.1'
   HOST_NAME: ${{ secrets.HOST_NAME }}
-  PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }}
-  PRIVATE_DART_REPOSITORY: ${{ secrets.PRIVATE_DART_REPOSITORY }}
-  PRIVATE_NATIVE_IOS_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY }}
-  PRIVATE_NATIVE_ANDROID_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_ANDROID_REPOSITORY }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_USERNAME: ${{ secrets.GH_USERNAME }}
   GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -22,9 +22,10 @@ env:
   RUBY_VERSION: '3.1'
   HOST_NAME: ${{ secrets.HOST_NAME }}
   PRIVATE_REPOSITORY_API_KEY: ${{ secrets.PRIVATE_REPOSITORY_API_KEY }}
-  PRIVATE_DART_REPOSITORY: ${{ secrets.PRIVATE_DART_REPOSITORY }}
-  PRIVATE_NATIVE_IOS_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY }}
-  PRIVATE_NATIVE_ANDROID_REPOSITORY: ${{ secrets.PRIVATE_NATIVE_ANDROID_REPOSITORY }}
+  PRIVATE_DART_REPOSITORY_URL: ${{ secrets.PRIVATE_DART_REPOSITORY_URL }}
+  PRIVATE_NATIVE_IOS_REPOSITORY_URL: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY_URL }}
+  PRIVATE_NATIVE_IOS_REPOSITORY_NAME: ${{ secrets.PRIVATE_NATIVE_IOS_REPOSITORY_NAME }}
+  PRIVATE_NATIVE_ANDROID_REPOSITORY_URL: ${{ secrets.PRIVATE_NATIVE_ANDROID_REPOSITORY_URL }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_USERNAME: ${{ secrets.GH_USERNAME }}
   GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -76,7 +77,7 @@ jobs:
 
       - name: Build iOS Example App
         env:
-          PRIVATE_NATIVE_REPOSITORY: ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY }}
+          PRIVATE_NATIVE_REPOSITORY_URL: ${{ env.PRIVATE_NATIVE_IOS_REPOSITORY_URL }}
         uses: maierj/[email protected]
         with:
           lane: 'pr'
@@ -103,7 +104,7 @@ jobs:
 
       - name: Build Android Example App
         env:
-          PRIVATE_NATIVE_REPOSITORY: ${{ env.PRIVATE_NATIVE_ANDROID_REPOSITORY }}
+          PRIVATE_NATIVE_REPOSITORY_URL: ${{ env.PRIVATE_NATIVE_ANDROID_REPOSITORY_URL }}
         uses: maierj/[email protected]
         with:
           lane: 'pr'

diff --git a/android/Gemfile b/android/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem 'fastlane', '~> 2.225'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/android/Gemfile.lock b/android/Gemfile.lock
@@ -10,20 +10,20 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.940.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.1001.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.83.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -38,7 +38,7 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
+    excon (0.112.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,10 +65,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +84,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -112,6 +113,8 @@ GEM
     fastlane-plugin-firebase_app_distribution (0.9.1)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -133,7 +136,7 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
@@ -154,14 +157,14 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.6)
     jwt (2.8.1)
       base64
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -193,6 +196,7 @@ GEM
       CFPropertyList
       naturally
     strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -202,7 +206,7 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -217,14 +221,13 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  arm64-darwin-21
-  x86_64-darwin-19
-  x86_64-darwin-20
+  arm64-darwin
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
-  fastlane
+  fastlane (~> 2.225)
   fastlane-plugin-firebase_app_distribution
 
 BUNDLED WITH
-   2.5.6
+   2.5.23
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
@@ -9,10 +9,9 @@ root_dir = File.expand_path(File.join(File.dirname(__FILE__), "../"))
 signing_configs_gradle = File.join(root_dir, "app/signing_configs.gradle")
 apk_path = File.join(root_dir, "../build/app/outputs/flutter-apk/app-debug.apk")
 display_name = "Nevis Mobile Authentication SDK Example App Flutter Android"
-android_manifest = File.join(root_dir, "app/src/main/AndroidManifest.xml")
 app_build_gradle = File.join(root_dir, "app/build.gradle")
 build_gradle = File.join(root_dir, "build.gradle")
-public_maven_repository = "https://maven.pkg.github.com/nevissecurity/nevis-mobile-authentication-sdk-android-package"
+public_maven_repository_url = "https://maven.pkg.github.com/nevissecurity/nevis-mobile-authentication-sdk-android-package"
 
 def report_on_success(message)
 	slack(
@@ -73,12 +72,12 @@ platform :android do
 	desc "Utilize private repositories"
 	desc ""
 	private_lane :utilize_private_repos do
-		private_maven_repository = ENV["PRIVATE_NATIVE_REPOSITORY"]
+		private_maven_repository_url = ENV["PRIVATE_NATIVE_REPOSITORY_URL"]
 		modify_file(
 			file_path: build_gradle,
-			old_value: "url \"#{public_maven_repository}\"",
-			new_value: "url \"#{private_maven_repository}\"",
-		) if private_maven_repository
+			old_value: "url \"#{public_maven_repository_url}\"",
+			new_value: "url \"#{private_maven_repository_url}\"",
+		) if private_maven_repository_url
 	end
 
 	desc "Build the application"

diff --git a/ios/Gemfile b/ios/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem 'cocoapods', '~> 1.15.2'
-gem 'fastlane', '~> 2.221'
+gem 'cocoapods', '~> 1.16'
+gem 'fastlane', '~> 2.225'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)