chore: Update match to use Gitlab repo

.github/actions/appetize-build/action.yml

@@ -52,6 +52,12 @@ inputs:
   stripe-publishable-key:
     description: 'Stripe publishable key'
     required: true
+  gitlab-username:
+    description: 'GitLab username'
+    required: true
+  gitlab-password:
+    description: 'GitLab password'
+    required: true
 outputs:
   appetize-url:
     description: Appetize URL
@@ -103,6 +109,8 @@ runs:
         BUILD_TYPE: ${{ inputs.build_type }}
         GITHUB_RUN_ID: ${{ inputs.github-run-id }}
         PR_NUMBER: ${{ inputs.pr-number}}
+        GITLAB_USERNAME: ${{ inputs.gitlab-username }}
+        GITLAB_PASSWORD: ${{ inputs.gitlab-password }}
     - name: Create Slack Success Summary Report
       if: ${{ success()  }}
       shell: bash

.github/actions/sdk-tests/action.yml

@@ -1,5 +1,5 @@
-name: 'Run SDK tests'
-description: 'Test the SDK using SPM'
+name: "Run SDK tests"
+description: "Test the SDK using SPM"
 inputs:
   ssh-private-key:
     description: SSH private key
@@ -10,9 +10,6 @@ inputs:
   match-password:
     description: Match password
     required: true
-  match-git-private-key:
-    description: Match git private key
-    required: true
   fastlane-password:
     description: Fastlane password
     required: true
@@ -22,7 +19,7 @@ inputs:
   fastlane-test-lane:
     description: The fastlane test lane to run
     required: false
-    default: test_sdk 
+    default: test_sdk
   match-keychain-name:
     description: Match keychain name
     required: true
@@ -38,24 +35,24 @@ inputs:
   package-swift:
     description: The swift package file to use, if not default
     required: false
+  gitlab-username:
+    description: "GitLab username"
+    required: true
+  gitlab-password:
+    description: "GitLab password"
+    required: true
 
 runs:
   using: "composite"
   steps:
     - name: Select Xcode Version
       uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
       with:
-        xcode-version: '16.2.0'
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@d4fffb50872869abe2d9a9098a6d9c5aa7d16be4 #v2.7.0
-      with:
-        key: ${{ inputs.ssh-private-key }}
-        name: id_rsa_github_actions
-        known_hosts: ${{ inputs.known-hosts }}
+        xcode-version: "16.2.0"
     - uses: webfactory/ssh-agent@dc588b651fe13675774614f8e6a936a468676387 # v0.9.0
       with:
         ssh-private-key: ${{ inputs.ssh-private-key }}
-    - uses: ruby/setup-ruby@d4526a55538b775af234ba4af27118ed6f8f6677  # v1.172.0
+    - uses: ruby/setup-ruby@d4526a55538b775af234ba4af27118ed6f8f6677 # v1.172.0
       with:
         ruby-version: "3.2"
         bundler-cache: true
@@ -71,12 +68,13 @@ runs:
         bundle exec fastlane ${{ inputs.fastlane-test-lane }}
       env:
         MATCH_PASSWORD: ${{ inputs.match-password }}
-        MATCH_GIT_PRIVATE_KEY: ${{ inputs.ssh-private-key }}
         FASTLANE_PASSWORD: ${{ inputs.fastlane-password }}
         FASTLANE_SESSION: ${{ inputs.fastlane-session }}
         MATCH_KEYCHAIN_NAME: ${{ inputs.match-keychain-name }}
         MATCH_KEYCHAIN_PASSWORD: ${{ inputs.match-password }}
         SOURCE_BRANCH: ${{ inputs.source-branch }}
+        GITLAB_USERNAME: ${{ inputs.gitlab-username }}
+        GITLAB_PASSWORD: ${{ inputs.gitlab-password }}
     - name: Prepare coverage reports
       shell: bash
       if: ${{ inputs.sdk-name != '' }}

.github/workflows/build-test-upload.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   unit-tests-sdk:
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 20
     name: "Unit Tests - SDK"
     steps:
@@ -30,16 +30,17 @@ jobs:
           ssh-private-key: ${{ secrets.SSH_KEY }}
           known-hosts: ${{ secrets.KNOWN_HOSTS }}
           match-password: ${{ secrets.MATCH_PASSWORD }}
-          match-git-private-key: ${{ secrets.FASTLANE_PASSWORD }}
           fastlane-session: ${{ secrets.FASTLANE_SESSION }}
           fastlane-password: ${{ secrets.FASTLANE_PASSWORD }}
           match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
           match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
           sdk-name: sdk
 
   optional-sdk-tests:
     name: Optional SDK Tests
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     strategy:
       max-parallel: 3
       matrix:
@@ -70,9 +71,11 @@ jobs:
           match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
           sdk-name: ${{ matrix.package-swift.name }}
           package-swift: ${{  matrix.package-swift.file }}
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
 
   unit-tests-debug-app:
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 20
     name: "Unit Tests - Debug App"
     steps:
@@ -96,11 +99,13 @@ jobs:
           match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
           match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
           fastlane-test-lane: test_debug_app
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
 
 
   spm-build:
     needs: unit-tests-debug-app
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 20
     name: "Build app with SPM Integration"
     steps:
@@ -140,13 +145,15 @@ jobs:
           MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
           MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
           SOURCE_BRANCH: ${{ github.head_ref }}
+          GITLAB_USERNAME: ${{ secrets.GITLAB_USERNAME }}
+          GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
 
   sonarcloud:
     needs:
       - unit-tests-sdk
       - optional-sdk-tests
     name: SonarCloud
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -168,7 +175,7 @@ jobs:
     needs: 
       - unit-tests-sdk
       - unit-tests-debug-app
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 45
     name: "Run Critical Path UI Tests"
     steps:
@@ -219,7 +226,7 @@ jobs:
     needs:
       - unit-tests-sdk
       - unit-tests-debug-app
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 45
     name: "Build and upload app to Appetize"
     steps:
@@ -252,6 +259,8 @@ jobs:
           slack-reporter-token: ${{ secrets.SLACK_REPORTER_BOT_TOKEN }}
           github-run-id: ${{ github.run_id }}
           stripe-publishable-key: ${{ secrets.STRIPE_PUBLISHABLE_KEY }}
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
       - uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e #v3.1.0
         if: ${{ success() }}
         id: find_comment

.github/workflows/pod_lint.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   pod-lint:
     if: ${{ github.event.pull_request.base.ref == 'master' }}
-    runs-on: macos-latest
+    runs-on: macos-15
     name: "Pod lint"
     strategy:
       fail-fast: false

.github/workflows/test-and-code-quality.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   sdk-unit-tests:
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     timeout-minutes: 20
     name: "SDK - Unit Tests"
     steps:
@@ -36,10 +36,12 @@ jobs:
           match-keychain-name: ${{ secrets.MATCH_KEYCHAIN_NAME }}
           match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
           sdk-name: sdk
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
 
   optional-sdk-tests:
     name: Optional SDK Tests
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     strategy:
       max-parallel: 3
       matrix:
@@ -69,13 +71,14 @@ jobs:
           match-keychain-password: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
           sdk-name: ${{ matrix.package-swift.name }}
           package-swift: ${{  matrix.package-swift.file }}
-
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
 
   sonarcloud:
     needs:
       - sdk-unit-tests
       - optional-sdk-tests
-    runs-on: macos-latest-large
+    runs-on: macos-15-large
     name: SonarCloud
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/ui-tests.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   build-and-upload-to-appetize:
-    runs-on: macos-latest
+    runs-on: macos-15
     timeout-minutes: 20
     name: "Build and upload app to Appetize"
     steps:
@@ -54,8 +54,10 @@ jobs:
           slack-reporter-token: ${{ secrets.SLACK_REPORTER_BOT_TOKEN }}
           github-run-id: ${{ github.run_id }}
           stripe-publishable-key: ${{ secrets.STRIPE_PUBLISHABLE_KEY }}
+          gitlab-username: ${{ secrets.GITLAB_USERNAME }}
+          gitlab-password: ${{ secrets.GITLAB_PASSWORD }}
   build-and-upload-to-firebase-and-browserstack:
-    runs-on: macos-latest
+    runs-on: macos-15
     timeout-minutes: 20
     name: "Distribute app to Firebase and Browserstack"
     steps:
@@ -118,6 +120,8 @@ jobs:
           BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
           SOURCE_BRANCH: ${{ github.ref }}
+          GITLAB_USERNAME: ${{ secrets.GITLAB_USERNAME }}
+          GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
       - name: Save Browserstack ID
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4.6.1
         id: save_browserstack_id_step

.github/workflows/xcode-versions-build.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: "Build App"
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       max-parallel: 3
       matrix:
@@ -86,7 +86,7 @@ jobs:
   success:
     name: Report Success
     needs: build
-    runs-on: macos-latest
+    runs-on: macos-15
     steps:
       - name: Git - Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.gitignore

@@ -84,6 +84,7 @@ fastlane/report.xml
 ### Misc
 .idea
 .DS_Store
+JM91JR5L1QGH.json
 
 ### Primer
 Debug App/Pods

.swiftformat

@@ -0,0 +1,22 @@
+--maxwidth 150
+--exclude Sources/PrimerSDK/Classes/Third Party/PromiseKit,**/Pods/**,Dangerfile.swift
+
+# Basic rules
+--indent 4
+--trimwhitespace always
+--linebreaks lf
+
+# Matches with SwiftLint
+--disable redundantSelf
+--disable unusedArguments
+--swiftversion 5.0
+
+# File organization
+--header ignore
+
+# Wrapping
+--wraparguments before-first
+--wrapcollections before-first
+--funcattributes prev-line
+--typeattributes prev-line
+--varattributes same-line 

.swiftlint.yml

@@ -0,0 +1,17 @@
+disabled_rules:
+    - superfluous_disable_command
+
+line_length:
+  warning: 150
+  ignores_function_declarations: true
+  ignores_comments: true
+  ignores_interpolated_strings: true
+  ignores_urls: true
+
+included:
+  - Debug App/Sources
+
+excluded:
+  - Debug App/Sources/PrimerSDK/Classes/Third Party/PromiseKit
+  - Debug App/Pods/**/*
+  - Dangerfile.swift

fastlane/Fastfile

@@ -1,3 +1,4 @@
+require('base64')
 default_platform(:ios)
 
 #----------------------- CONSTANTS -------------------------#
@@ -277,11 +278,21 @@ platform :ios do
       lock_when_sleeps: true
     )
 
+    username = "security@primerapi.com" 
+    username = ENV['GITLAB_USERNAME'] 
+    personal_access_token = ENV['GITLAB_PASSWORD']
+
+    credentials = "#{username}:#{personal_access_token}"
+    encoded_credentials = Base64.strict_encode64(credentials)
+
+    puts "encoded_credentials: " + encoded_credentials
+
     match(
       type: options[:match_type],
       readonly: true,
       keychain_name: ENV["MATCH_KEYCHAIN_NAME"],
       keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
+      git_basic_authorization: encoded_credentials
     )
 
   end

fastlane/Matchfile

@@ -1,19 +1,10 @@
-git_url("git@github.com:primer-io/ios_sdk_match_repo.git")
-# git_url("https://github.com/primer-io/ios_sdk_match_repo.git")
-
+git_url("https://gitlab.com/primer-io/acceptance/mobile/ios-sdk-match-repo.git")
 storage_mode("git")
-
+git_branch("main")
 type("development") # The default type, can be: appstore, adhoc, enterprise or development
 
+
 app_identifier("com.primerapi.PrimerSDKExample")
 username("security@primerapi.com") # Your Apple Developer Portal username
 
 platform("ios")
-shallow_clone true
-force_for_new_devices true
-clone_branch_directly true
-
-# For all available options run `fastlane match --help`
-# Remove the # in the beginning of the line to enable the other options
-
-# The docs are available on https://docs.fastlane.tools/actions/match