From 00ea4562dc30752f4c0ad8bd390a1606997bb8b2 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Tue, 7 Jun 2022 18:56:11 -0700 Subject: [PATCH 1/2] Update project files for Xcode 14 recommendations Update all project files with new upgrade version number, and add the dead code stripping option. Don't touch MASShortcut because it's not my project. Signed-off-by: Christopher Snowhill --- Audio/CogAudio.xcodeproj/project.pbxproj | 8 +++++--- .../xcshareddata/xcschemes/CogAudio Framework.xcscheme | 2 +- Cog.xcodeproj/project.pbxproj | 6 +++++- Cog.xcodeproj/xcshareddata/xcschemes/Cog.xcscheme | 2 +- Frameworks/AdPlug/libAdPlug.xcodeproj/project.pbxproj | 6 +++++- .../File_Extractor.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/File_Extractor.xcscheme | 2 +- Frameworks/GME/GME.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/GME Framework.xcscheme | 2 +- .../HighlyAdvanced.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HighlyAdvanced.xcscheme | 2 +- .../HighlyExperimental.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HighlyExperimental.xcscheme | 2 +- .../HighlyQuixotic.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HighlyQuixotic.xcscheme | 2 +- .../HighlyTheoretical.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HighlyTheoretical.xcscheme | 2 +- .../HivelyPlayer/HivelyPlayer.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HivelyPlayer.xcscheme | 2 +- Frameworks/MPCDec/MPCDec.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/mpcdec Framework.xcscheme | 2 +- .../OpenMPT.old/libOpenMPTOld.xcodeproj/project.pbxproj | 6 +++++- Frameworks/OpenMPT/libOpenMPT.xcodeproj/project.pbxproj | 6 +++++- .../SSEQPlayer/SSEQPlayer.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/SSEQPlayer.xcscheme | 2 +- Frameworks/Shorten/Shorten.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Shorten Framework.xcscheme | 2 +- Frameworks/TagLib/TagLib.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/TagLib Framework.xcscheme | 2 +- Frameworks/WavPack/WavPack.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/WavPack Framework.xcscheme | 2 +- Frameworks/g719/g719.xcodeproj/project.pbxproj | 6 +++++- .../g719.xcodeproj/xcshareddata/xcschemes/g719.xcscheme | 2 +- Frameworks/lazyusf2/lazyusf2.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/lazyusf2.xcscheme | 2 +- Frameworks/libatrac9/libatrac9.xcodeproj/project.pbxproj | 6 +++++- Frameworks/libbinio/libbinio.xcodeproj/project.pbxproj | 6 +++++- .../libcelt_0061/libcelt_0061.xcodeproj/project.pbxproj | 6 +++++- .../libcelt_0110/libcelt_0110.xcodeproj/project.pbxproj | 6 +++++- .../libsidplayfp/sidplayfp.xcodeproj/project.pbxproj | 6 +++++- Frameworks/mGBA/mGBA.xcodeproj/project.pbxproj | 6 +++++- .../mGBA.xcodeproj/xcshareddata/xcschemes/mGBA.xcscheme | 2 +- .../midi_processing.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/midi_processing.xcscheme | 2 +- Frameworks/mpg123/mpg123.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/mpg123.xcscheme | 2 +- Frameworks/psflib/psflib.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/psflib.xcscheme | 2 +- .../vgmstream/libvgmstream.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/vgmstream.xcscheme | 2 +- Frameworks/vio2sf/vio2sf.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/vio2sf.xcscheme | 2 +- Plugins/APL/APL.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/APL Plugin.xcscheme | 2 +- Plugins/AdPlug/AdPlug.xcodeproj/project.pbxproj | 6 +++++- .../ArchiveSource/ArchiveSource.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/ArchiveSource.xcscheme | 2 +- Plugins/CoreAudio/CoreAudio.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/CoreAudio Plugin.xcscheme | 2 +- Plugins/CueSheet/CueSheet.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/CueSheet.xcscheme | 2 +- Plugins/FFMPEG/FFMPEG.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/FFMPEG Plugin.xcscheme | 2 +- Plugins/FileSource/FileSource.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/FileSource Plugin.xcscheme | 2 +- Plugins/Flac/Flac.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Flac Plugin.xcscheme | 2 +- Plugins/GME/GME.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/GME Plugin.xcscheme | 2 +- Plugins/HTTPSource/HTTPSource.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HTTPSource Plugin.xcscheme | 2 +- .../HighlyComplete.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/HighlyComplete.xcscheme | 2 +- Plugins/Hively/Hively.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Hively.xcscheme | 2 +- Plugins/M3u/M3u.xcodeproj/project.pbxproj | 6 +++++- .../M3u/M3u.xcodeproj/xcshareddata/xcschemes/M3u.xcscheme | 2 +- Plugins/MAD/MAD.xcodeproj/project.pbxproj | 6 +++++- Plugins/MIDI/MIDI.xcodeproj/project.pbxproj | 6 +++++- .../MIDI.xcodeproj/xcshareddata/xcschemes/MIDI.xcscheme | 2 +- Plugins/Musepack/Musepack.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Musepack Plugin.xcscheme | 2 +- Plugins/OpenMPT.old/OpenMPTOld.xcodeproj/project.pbxproj | 6 +++++- Plugins/OpenMPT/OpenMPT.xcodeproj/project.pbxproj | 6 +++++- Plugins/Opus/OpusPlugin.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Opus.xcscheme | 2 +- Plugins/Pls/Pls.xcodeproj/project.pbxproj | 6 +++++- .../Pls/Pls.xcodeproj/xcshareddata/xcschemes/Pls.xcscheme | 2 +- Plugins/Shorten/Shorten.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Shorten Plugin.xcscheme | 2 +- .../SilenceDecoder.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/SilenceDecoder.xcscheme | 2 +- Plugins/TagLib/TagLib.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/TagLib Plugin.xcscheme | 2 +- Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Vorbis Plugin.xcscheme | 2 +- Plugins/WavPack/WavPack.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/WavPack Plugin.xcscheme | 2 +- .../libvgmPlayer/libvgmPlayer.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/GME Plugin.xcscheme | 2 +- Plugins/sidplay/sidplay.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/sidplay.xcscheme | 2 +- Plugins/vgmstream/vgmstream.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/vgmstream.xcscheme | 2 +- .../Preferences/Preferences.xcodeproj/project.pbxproj | 6 +++++- .../xcshareddata/xcschemes/Preferences.xcscheme | 2 +- 106 files changed, 342 insertions(+), 108 deletions(-) diff --git a/Audio/CogAudio.xcodeproj/project.pbxproj b/Audio/CogAudio.xcodeproj/project.pbxproj index ecc812d19..9123faabb 100644 --- a/Audio/CogAudio.xcodeproj/project.pbxproj +++ b/Audio/CogAudio.xcodeproj/project.pbxproj @@ -86,7 +86,6 @@ 83B69B7A2845DF6500D2435A /* pf_avx_double.h in Headers */ = {isa = PBXBuildFile; fileRef = 83B69B712845DF6500D2435A /* pf_avx_double.h */; }; 83B69B7B2845DF6500D2435A /* pf_scalar_double.h in Headers */ = {isa = PBXBuildFile; fileRef = 83B69B722845DF6500D2435A /* pf_scalar_double.h */; }; 83B69B7C2845DF6500D2435A /* pffft_priv_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 83B69B732845DF6500D2435A /* pffft_priv_impl.h */; }; - 83B69B7D2845DF6500D2435A /* pffft_double.c in Sources */ = {isa = PBXBuildFile; fileRef = 83B69B742845DF6500D2435A /* pffft_double.c */; }; 83F18B1E27D1E8EF00385946 /* CDSPHBDownsampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F18ADF27D1E8EF00385946 /* CDSPHBDownsampler.h */; }; 83F18B3327D1E8EF00385946 /* CDSPSincFilterGen.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F18AF827D1E8EF00385946 /* CDSPSincFilterGen.h */; }; 83F18B3427D1E8EF00385946 /* r8butil.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F18AF927D1E8EF00385946 /* r8butil.h */; }; @@ -654,7 +653,7 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1250; + LastUpgradeCheck = 1400; TargetAttributes = { 8DC2EF4F0486A6940098B216 = { DevelopmentTeam = ""; @@ -706,7 +705,6 @@ 8399CF2D27B5D1D5008751F1 /* NSDictionary+Merge.m in Sources */, 17D21CA80B8BE4BA00D1EBDE /* Node.m in Sources */, 17D21CAA0B8BE4BA00D1EBDE /* OutputNode.m in Sources */, - 83B69B7D2845DF6500D2435A /* pffft_double.c in Sources */, 8377C65327B8CAD100E8BC0F /* VisualizationController.m in Sources */, 834FD4F527AFA2150063BC83 /* Downmix.m in Sources */, 17D21CC60B8BE4BA00D1EBDE /* OutputCoreAudio.m in Sources */, @@ -747,6 +745,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -783,6 +782,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -834,6 +834,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -878,6 +879,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme index cf4fae5ee..af03e74cc 100644 --- a/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme +++ b/Audio/CogAudio.xcodeproj/xcshareddata/xcschemes/CogAudio Framework.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 7 Jun 2022 18:57:19 -0700 Subject: [PATCH 2/2] [Playlist Controller] Fix ambiguity with Xcode 14 This NSArray member call is ambiguous, but Xcode <14 allowed it. Signed-off-by: Christopher Snowhill --- Playlist/PlaylistController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index db743e7f7..9dfb68474 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -825,7 +825,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc // Cheap hack so the index column isn't sorted if([sortDescriptors count] != 0) { - if([[sortDescriptors[0] key] caseInsensitiveCompare:@"index"] == NSOrderedSame) { + if([[((NSSortDescriptor *)(sortDescriptors[0])) key] caseInsensitiveCompare:@"index"] == NSOrderedSame) { // Remove the sort descriptors [super setSortDescriptors:@[]]; [self rearrangeObjects];