From 85c74b1a169acd5ff60452bbf28c6861393132e4 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Sat, 21 Dec 2024 16:52:39 +0100
Subject: [PATCH] some more adjustments

---
 frontend/.github/workflows/build_app_ios.yaml | 13 ++++++-------
 frontend/ios/Runner/AppDelegate.swift         |  1 -
 frontend/ios/fastlane/Fastfile                |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/.github/workflows/build_app_ios.yaml b/frontend/.github/workflows/build_app_ios.yaml
index 15e63c7..4f35c33 100644
--- a/frontend/.github/workflows/build_app_ios.yaml
+++ b/frontend/.github/workflows/build_app_ios.yaml
@@ -5,15 +5,18 @@ on:
 
 jobs:
   build:
-    runs-on: macos-15
+    runs-on: macos-latest
+    env:
+      # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ios/Gemfile
     steps:
       - uses: actions/checkout@v4
 
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.1
-          bundler-cache: true
+          ruby-version: 3.3
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Install Flutter
         uses: subosito/flutter-action@v2
@@ -39,10 +42,6 @@ jobs:
         env:
           MATCH_REPO_SSH_KEY: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
 
-      - name: Install fastlane
-        run: bundle install
-        working-directory: ios
-
       - name: Install dependencies and clean up
         run: |
           flutter pub get
diff --git a/frontend/ios/Runner/AppDelegate.swift b/frontend/ios/Runner/AppDelegate.swift
index c3ad1bb..2309a7b 100644
--- a/frontend/ios/Runner/AppDelegate.swift
+++ b/frontend/ios/Runner/AppDelegate.swift
@@ -8,7 +8,6 @@ import GoogleMaps
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    // load the key from env
     GMSServices.provideAPIKey("IOS_GOOGLE_MAPS_API_KEY")
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
diff --git a/frontend/ios/fastlane/Fastfile b/frontend/ios/fastlane/Fastfile
index 6be2c9d..f3e23f4 100644
--- a/frontend/ios/fastlane/Fastfile
+++ b/frontend/ios/fastlane/Fastfile
@@ -70,7 +70,7 @@ platform :ios do
       "-i",
       "",
       "s/IOS_GOOGLE_MAPS_API_KEY/#{ENV["IOS_GOOGLE_MAPS_API_KEY"]}/g",
-      "ios/Runner/AppDelegate.swift"
+      "../Runner/AppDelegate.swift"
 
     )