Updates for Xcode 15

vslavik · May 22, 2024 · 915399d · 915399d
1 parent 637503d
commit 915399d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
 
   build-macos:
     name: Build on macOS
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - name: Setup parallel submodule fetching
       run: git config --global submodule.fetchJobs 10
@@ -84,7 +84,7 @@ jobs:
       run: brew bundle --file=macos/Brewfile
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '^14.3.0'
+        xcode-version: '^15.0.0'
     - uses: sersoft-gmbh/xcodebuild-action@v3
       with:
         workspace: Poedit.xcworkspace

diff --git a/Poedit.xcodeproj/project.pbxproj b/Poedit.xcodeproj/project.pbxproj
@@ -190,7 +190,6 @@
 		B2F25F0D199E327C00127FF9 /* spellchecking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2F25F0C199E327C00127FF9 /* spellchecking.cpp */; };
 		B2F287C0170DCC63004C1F41 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B248B2DF170D765100EBA58E /* CoreFoundation.framework */; };
 		B2F3C2912B891644008E0593 /* app_updates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2F3C28F2B891644008E0593 /* app_updates.cpp */; };
-		B2FD1DD82BA8B8450024BA78 /* poedit.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = B2FD1DD72BA8B8450024BA78 /* poedit.xcconfig */; };
 		B2FE296B1AC85FFF005588E4 /* keytar_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = B2FE29691AC85FFF005588E4 /* keytar_mac.cc */; };
 /* End PBXBuildFile section */
 
@@ -1079,16 +1078,6 @@
 		};
 /* End PBXGroup section */
 
-/* Begin PBXHeadersBuildPhase section */
-		B2CE6D171ACFCD95007E6863 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
 /* Begin PBXNativeTarget section */
 		B248B2DD170D765100EBA58E /* GettextTools */ = {
 			isa = PBXNativeTarget;
@@ -1116,12 +1105,12 @@
 				B24ACD5716F6201F00399242 /* Sources */,
 				B24ACD5816F6201F00399242 /* Frameworks */,
 				B24ACD5916F6201F00399242 /* Resources */,
-				B2CC62E117DB7E2D0097461B /* Set CFBundleVersion from git */,
 				B2E836D81709EB0700F31559 /* Copy Private Frameworks */,
 				B23D1F72181446EF00E6B212 /* Copy Auxiliary Binaries */,
 				B2B7D470170DD91C00ED0AFE /* Copy Gettext bundle */,
 				B2D0B1102BFCFEF400527A5A /* Codesign Gettext bundle */,
 				B2CE6D2A1AD0096C007E6863 /* Copy Quicklook plugin */,
+				B2CC62E117DB7E2D0097461B /* Set CFBundleVersion from git */,
 				B2E83707170C96DB00F31559 /* Copy PO Translations */,
 			);
 			buildRules = (
@@ -1145,7 +1134,6 @@
 			buildPhases = (
 				B2CE6D151ACFCD95007E6863 /* Sources */,
 				B2CE6D161ACFCD95007E6863 /* Frameworks */,
-				B2CE6D171ACFCD95007E6863 /* Headers */,
 				B2CE6D181ACFCD95007E6863 /* Resources */,
 				B2CE6D291AD008F6007E6863 /* Set CFBundleVersion from git */,
 				B25CC3CE2BC8247900BED2FD /* Copy PO Translations */,
@@ -1168,7 +1156,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = PO;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1520;
 				ORGANIZATIONNAME = "Václav Slavík";
 				TargetAttributes = {
 					B2CE6D191ACFCD95007E6863 = {
@@ -1291,7 +1279,6 @@
 				B2A012B321BEE4C5008051FD /* [email protected] in Resources */,
 				B20F31D0216654DA005B7037 /* StatusWarningBlack.png in Resources */,
 				B20F31CC216654D2005B7037 /* [email protected] in Resources */,
-				B2FD1DD82BA8B8450024BA78 /* poedit.xcconfig in Resources */,
 				B2B735F92A5865320037A0DA /* [email protected] in Resources */,
 				B2CE2FF21A94F19D0020A620 /* Prefs-Accounts.png in Resources */,
 				B2E3EE4E256D658500FCE1BF /* Prefs-Advanced.png in Resources */,

diff --git a/Poedit.xcworkspace/xcshareddata/xcschemes/Poedit.xcscheme b/Poedit.xcworkspace/xcshareddata/xcschemes/Poedit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Poedit.xcworkspace/xcshareddata/xcschemes/PoeditQuicklook.xcscheme b/Poedit.xcworkspace/xcshareddata/xcschemes/PoeditQuicklook.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macos/copy-translations.sh b/macos/copy-translations.sh
@@ -45,6 +45,8 @@ try_compile_po()
     fi
 }
 
+mkdir -p "$DESTDIR"
+
 for lang in `get_all_langs`; do
     lproj="$DESTDIR/`lang_to_macos $lang`.lproj"
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,8 @@ try_compile_po() @@
         fi
     }
+    mkdir -p "$DESTDIR"
     for lang in `get_all_langs`; do
         lproj="$DESTDIR/`lang_to_macos $lang`.lproj"
@@ Expand Down @@