From 4a6ccbb8de47d1746bb0ae6069fc7332b47d336b Mon Sep 17 00:00:00 2001
From: Mathijs Bernson <mathijsb@q42.nl>
Date: Tue, 21 May 2024 13:48:23 +0200
Subject: [PATCH 1/2] Fix invalid artifact names

Remove ref name from artifact name. Because the reference name (aka branch name) can contain slashes, it may break the upload-artifact action.
---
 .github/workflows/build.yml | 4 ++--
 .github/workflows/test.yml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59c9d13..9865183 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: ${{ env.SCHEME }}-${{ github.ref_name }}-${{ github.sha }}.xcresult
+        name: ${{ env.SCHEME }}-${{ github.sha }}.xcresult
         path: ${{ env.TEST_RESULT_BUNDLE }}
 
     - name: Archive build
@@ -115,5 +115,5 @@ jobs:
     - name: Upload build artifact
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.SCHEME }}-${{ github.ref_name }}-${{ github.sha }}.xcarchive
+        name: ${{ env.SCHEME }}-${{ github.sha }}.xcarchive
         path: ${{ runner.temp }}/${{ env.ARCHIVE_PATH }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fce0e58..32b6d46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,5 +56,5 @@ jobs:
       uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: ${{ env.SCHEME }}-${{ github.ref_name }}-${{ github.sha }}.xcresult
+        name: ${{ env.SCHEME }}-${{ github.sha }}.xcresult
         path: ${{ env.TEST_RESULT_BUNDLE }}

From c03eb6823f6c33d64079d18065a9cdcf3fcd8ed2 Mon Sep 17 00:00:00 2001
From: Mathijs Bernson <mathijsb@q42.nl>
Date: Mon, 10 Jun 2024 18:08:30 +0200
Subject: [PATCH 2/2] Update to Xcode recommended project settings

---
 TemplateApp.xcodeproj/project.pbxproj                         | 4 +++-
 .../xcshareddata/xcschemes/TemplateApp.xcscheme               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/TemplateApp.xcodeproj/project.pbxproj b/TemplateApp.xcodeproj/project.pbxproj
index 8edbb94..0f48088 100644
--- a/TemplateApp.xcodeproj/project.pbxproj
+++ b/TemplateApp.xcodeproj/project.pbxproj
@@ -231,7 +231,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1510;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = Q42;
 				TargetAttributes = {
 					D5284F2B2B57C6B600BB32E7 = {
@@ -348,6 +348,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -411,6 +412,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
diff --git a/TemplateApp.xcodeproj/xcshareddata/xcschemes/TemplateApp.xcscheme b/TemplateApp.xcodeproj/xcshareddata/xcschemes/TemplateApp.xcscheme
index d894ae9..d84816f 100644
--- a/TemplateApp.xcodeproj/xcshareddata/xcschemes/TemplateApp.xcscheme
+++ b/TemplateApp.xcodeproj/xcshareddata/xcschemes/TemplateApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1540"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"