Merge remote-tracking branch 'origin/main' into dima/user-selection

Author: boxdot

.github/workflows/ios_build.yml

@@ -59,7 +59,23 @@ jobs:
           name: golden-failures
           path: app/test/**/failures/*
 
+      - name: Detect if PR is from a fork
+        id: detect_fork
+        shell: bash
+        run: |
+          if [ "${{ github.event.pull_request.head.repo.full_name }}" = "${{ github.repository }}" ]; then
+            echo "is_fork=false" >> $GITHUB_OUTPUT
+          else
+            echo "is_fork=true" >> $GITHUB_OUTPUT
+          fi
+
       - name: Build iOS app
+        if: ${{ steps.detect_fork.outputs.is_fork == 'true' }}
+        run: |
+          cd app && fastlane ios build_ios
+
+      - name: Build and sign iOS app
+        if: ${{ steps.detect_fork.outputs.is_fork == 'false' }}
         env:
           APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
           APP_STORE_ISSUER_ID: ${{ secrets.APP_STORE_ISSUER_ID }}
@@ -70,4 +86,4 @@ jobs:
           MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
           MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
         run: |
-          cd app && fastlane beta_ios --verbose
+          cd app && fastlane ios beta_ios --verbose

REUSE.toml

@@ -57,6 +57,12 @@ precedence = "aggregate"
 SPDX-FileCopyrightText = "2024 Phoenix R&D GmbH <[email protected]>"
 SPDX-License-Identifier = "AGPL-3.0-or-later"
 
+[[annotations]]
+path = "app/macos/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2025 Phoenix R&D GmbH <[email protected]>"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
 [[annotations]]
 path = "app/.fvmrc"
 precedence = "aggregate"

apiclient/src/as_api/mod.rs

@@ -106,7 +106,7 @@ impl ApiClient {
             Err(error) => {
                 error!(
                     %url,
-                    %error, "Got a POST message error while contacting the URL"
+                    ?error, "Got a POST message error while contacting the URL"
                 );
                 Err(AsRequestError::NetworkError(error.to_string()))
             }

app/.gitignore

@@ -71,7 +71,6 @@ Runner.ipa
 Runner.app.dSYM.zip
 
 # Other platforms
-macos/
 windows/
 web/
 

app/fastlane/Fastfile

@@ -115,15 +115,9 @@ end
 platform :ios do
   desc "Build app for TestFlight"
   lane :beta_ios do |options|
-    # Set XCode version
-    xcodes(
-      version: '16.1',
-      select_for_current_build_only: true,
-    )
-  
     # Set up CI
     setup_ci()
-  
+
     # Set parameters
     key_id = ENV['APP_STORE_KEY_ID']
     issuer_id = ENV['APP_STORE_ISSUER_ID']
@@ -171,7 +165,34 @@ platform :ios do
         readonly: is_ci,
       )
     end
+
+    # Build the app with signing
+    build_ios(with_signing: true)
 
+    # Upload the app to TestFlight if the parameter is set
+    if options[:upload_to_test_flight]
+      upload_to_testflight(
+        api_key: api_key, 
+        skip_waiting_for_build_processing: true,
+        distribute_external: false,
+      )
+    end
+  end
+
+  desc "Build app"
+  lane :build_ios do |options|
+    # The following is false when "with_signing" is not provided in the oprion and true otherwise
+    skip_signing = !options[:with_signing]
+
+    # Set XCode version
+    xcodes(
+      version: '16.1',
+      select_for_current_build_only: true,
+    )
+  
+    # Set up CI
+    setup_ci()
+
     # Install flutter dependencies
     sh "flutter pub get"
 
@@ -180,21 +201,14 @@ platform :ios do
       clean: true,
       podfile: "ios/Podfile"
     )
-    
+
     # Build the app
     build_app(
       workspace: "ios/Runner.xcworkspace", 
       scheme: "Runner",
+      skip_codesigning: skip_signing,
+      skip_package_ipa: skip_signing,
       export_method: "app-store",
     )
-  
-    # Upload the app to TestFlight if the parameter is set
-    if options[:upload_to_test_flight]
-      upload_to_testflight(
-        api_key: api_key, 
-        skip_waiting_for_build_processing: true,
-        distribute_external: false,
-      )
-    end
   end
 end

app/macos/.gitignore

@@ -0,0 +1,7 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/dgph
+**/xcuserdata/

app/macos/Flutter/Flutter-Debug.xcconfig

@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"

app/macos/Flutter/Flutter-Release.xcconfig

@@ -0,0 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"

app/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -0,0 +1,14 @@
+//
+//  Generated file. Do not edit.
+//
+
+import FlutterMacOS
+import Foundation
+
+import file_selector_macos
+import path_provider_foundation
+
+func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+}

app/macos/Podfile

@@ -0,0 +1,43 @@
+platform :osx, '10.14'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end