Skip to content

Commit c81a638

Browse files
MattKiazykMattKiazyk
committed
Merge branch 'main' into matt/cancelRuntimeDownload
2 parents 57bf6d8 + b3e91fa commit c81a638

20 files changed

Lines changed: 18581 additions & 4205 deletions

File tree

‎Xcodes.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
536CFDD4263C9A8000026CE0 /* XcodesSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536CFDD3263C9A8000026CE0 /* XcodesSheet.swift */; };
1414
53CBAB2C263DCC9100410495 /* XcodesAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53CBAB2B263DCC9100410495 /* XcodesAlert.swift */; };
1515
63EAA4EB259944450046AB8F /* ProgressButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63EAA4EA259944450046AB8F /* ProgressButton.swift */; };
16+
9DD4FFCB2B13EC1800C974F1 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 9DD4FFCA2B13EC1800C974F1 /* Localizable.xcstrings */; };
1617
B0403CF02AD92D7B00137C09 /* ReleaseNotesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0403CEF2AD92D7B00137C09 /* ReleaseNotesView.swift */; };
1718
B0403CF22AD934B600137C09 /* CompatibilityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0403CF12AD934B600137C09 /* CompatibilityView.swift */; };
1819
B0403CF42AD9381D00137C09 /* SDKsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0403CF32AD9381D00137C09 /* SDKsView.swift */; };
@@ -187,26 +188,13 @@
187188
/* End PBXCopyFilesBuildPhase section */
188189

189190
/* Begin PBXFileReference section */
190-
15FAD1652811D15600B63259 /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/Localizable.strings; sourceTree = "<group>"; };
191-
23703D6E29EBF63500DFA346 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
192-
25E2FA26284769A00014A318 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
193-
327DF109286ABE6B00D694D5 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
194191
36741BFC291E4FDB00A85AAE /* DownloadPreferencePane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadPreferencePane.swift; sourceTree = "<group>"; };
195192
36741BFE291E50F500A85AAE /* FileError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileError.swift; sourceTree = "<group>"; };
196-
4A5AAA1D28118FAD00528958 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
197193
536CFDD1263C94DE00026CE0 /* SignedInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignedInView.swift; sourceTree = "<group>"; };
198194
536CFDD3263C9A8000026CE0 /* XcodesSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodesSheet.swift; sourceTree = "<group>"; };
199195
53CBAB2B263DCC9100410495 /* XcodesAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodesAlert.swift; sourceTree = "<group>"; };
200-
58F743C02810A34900EEC0F3 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
201-
5AA8A6102877EDAD009ECDB0 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
202-
5C3927ED28E4B486007B5119 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
203196
63EAA4EA259944450046AB8F /* ProgressButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressButton.swift; sourceTree = "<group>"; };
204-
6CA3A090282EBE72005A6E35 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
205-
7CBF284E28606D2C001AA66B /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
206-
9D3C3AF7282EBE3300CB0D37 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
207-
A0187D39285792D1002F46F9 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
208-
AAB037D32839BD4700017680 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
209-
AB4EB0DE28541FA000FF3B1D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
197+
9DD4FFCA2B13EC1800C974F1 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
210198
B0403CEF2AD92D7B00137C09 /* ReleaseNotesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReleaseNotesView.swift; sourceTree = "<group>"; };
211199
B0403CF12AD934B600137C09 /* CompatibilityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompatibilityView.swift; sourceTree = "<group>"; };
212200
B0403CF32AD9381D00137C09 /* SDKsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKsView.swift; sourceTree = "<group>"; };
@@ -218,8 +206,6 @@
218206
B0C6AD032AD6E65700E64698 /* ReleaseDateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReleaseDateView.swift; sourceTree = "<group>"; };
219207
B0C6AD0A2AD9178E00E64698 /* IdenticalBuildView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdenticalBuildView.swift; sourceTree = "<group>"; };
220208
B0C6AD0C2AD91D7900E64698 /* IconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconView.swift; sourceTree = "<group>"; };
221-
B648F22B2810C1130096781B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
222-
C0AE7FA4283002DC00DA63D2 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
223209
CA11E7B92598476C00D2EE1C /* XcodeCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeCommands.swift; sourceTree = "<group>"; };
224210
CA2518EB25A7FF2B00F08414 /* AppStateUpdateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateUpdateTests.swift; sourceTree = "<group>"; };
225211
CA25192925A9644800F08414 /* XcodeInstallState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeInstallState.swift; sourceTree = "<group>"; };
@@ -322,7 +308,6 @@
322308
CAFE4ABB25B7D54B0064FE51 /* UpdatesPreferencePane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UpdatesPreferencePane.swift; sourceTree = "<group>"; };
323309
CAFFFED7259CDA5000903F81 /* XcodeListViewRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XcodeListViewRow.swift; sourceTree = "<group>"; };
324310
CAFFFEEE259CEAC400903F81 /* RingProgressViewStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RingProgressViewStyle.swift; sourceTree = "<group>"; };
325-
E2AFDCCA28F024D000864ADD /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
326311
E81D7E9F2805250100A205FC /* Collection+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+.swift"; sourceTree = "<group>"; };
327312
E832EAF72B0FBCF4001B570D /* RuntimeInstallationStepDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeInstallationStepDetailView.swift; sourceTree = "<group>"; };
328313
E84CF8C02B0FEB8300ECA259 /* RuntimesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimesView.swift; sourceTree = "<group>"; };
@@ -559,7 +544,7 @@
559544
CAD2E7AE2449575000113D76 /* Xcodes.entitlements */,
560545
CA8FB64D256E17B100469DA5 /* XcodesTest.entitlements */,
561546
E8CBDB8627ADD92000B22292 /* unxip */,
562-
E872EE502808D4F100D3DD8B /* Localizable.strings */,
547+
9DD4FFCA2B13EC1800C974F1 /* Localizable.xcstrings */,
563548
);
564549
path = Resources;
565550
sourceTree = "<group>";
@@ -819,8 +804,8 @@
819804
isa = PBXResourcesBuildPhase;
820805
buildActionMask = 2147483647;
821806
files = (
822-
E872EE4E2808D4F100D3DD8B /* Localizable.strings in Resources */,
823807
CAD2E7A92449575000113D76 /* Preview Assets.xcassets in Resources */,
808+
9DD4FFCB2B13EC1800C974F1 /* Localizable.xcstrings in Resources */,
824809
CA9FF83F2594FBC000E47BAF /* Licenses.rtf in Resources */,
825810
CAA858DB25A3E11F00ACF8C0 /* aria2-release-1.35.0.tar.gz in Resources */,
826811
CAD2E7A62449575000113D76 /* Assets.xcassets in Resources */,
@@ -1001,34 +986,6 @@
1001986
};
1002987
/* End PBXTargetDependency section */
1003988

1004-
/* Begin PBXVariantGroup section */
1005-
E872EE502808D4F100D3DD8B /* Localizable.strings */ = {
1006-
isa = PBXVariantGroup;
1007-
children = (
1008-
E872EE4F2808D4F100D3DD8B /* en */,
1009-
15FAD1652811D15600B63259 /* hi */,
1010-
B648F22B2810C1130096781B /* fr */,
1011-
4A5AAA1D28118FAD00528958 /* ru */,
1012-
58F743C02810A34900EEC0F3 /* es */,
1013-
C0AE7FA4283002DC00DA63D2 /* zh-Hans */,
1014-
9D3C3AF7282EBE3300CB0D37 /* tr */,
1015-
AAB037D32839BD4700017680 /* ko */,
1016-
25E2FA26284769A00014A318 /* it */,
1017-
AB4EB0DE28541FA000FF3B1D /* ja */,
1018-
6CA3A090282EBE72005A6E35 /* zh-Hant */,
1019-
A0187D39285792D1002F46F9 /* de */,
1020-
7CBF284E28606D2C001AA66B /* uk */,
1021-
5AA8A6102877EDAD009ECDB0 /* fi */,
1022-
5C3927ED28E4B486007B5119 /* ca */,
1023-
327DF109286ABE6B00D694D5 /* pt-BR */,
1024-
E2AFDCCA28F024D000864ADD /* nl */,
1025-
23703D6E29EBF63500DFA346 /* pl */,
1026-
);
1027-
name = Localizable.strings;
1028-
sourceTree = "<group>";
1029-
};
1030-
/* End PBXVariantGroup section */
1031-
1032989
/* Begin XCBuildConfiguration section */
1033990
CA8FB635256E154800469DA5 /* Test */ = {
1034991
isa = XCBuildConfiguration;
@@ -1082,6 +1039,7 @@
10821039
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10831040
GCC_WARN_UNUSED_FUNCTION = YES;
10841041
GCC_WARN_UNUSED_VARIABLE = YES;
1042+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
10851043
MACOSX_DEPLOYMENT_TARGET = 11.0;
10861044
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
10871045
MTL_FAST_MATH = YES;
@@ -1268,6 +1226,7 @@
12681226
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12691227
GCC_WARN_UNUSED_FUNCTION = YES;
12701228
GCC_WARN_UNUSED_VARIABLE = YES;
1229+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
12711230
MACOSX_DEPLOYMENT_TARGET = 11.0;
12721231
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
12731232
MTL_FAST_MATH = YES;
@@ -1325,6 +1284,7 @@
13251284
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13261285
GCC_WARN_UNUSED_FUNCTION = YES;
13271286
GCC_WARN_UNUSED_VARIABLE = YES;
1287+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
13281288
MACOSX_DEPLOYMENT_TARGET = 11.0;
13291289
MTL_ENABLE_DEBUG_INFO = NO;
13301290
MTL_FAST_MATH = YES;

0 commit comments

Comments
 (0)