Skip to content

Commit 43dd6d4

Browse files
ethanndicksonethanndickson
committed
upgrade all to swift 6
1 parent 0dd1827 commit 43dd6d4

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

‎Coder Desktop/Coder Desktop.xcodeproj/project.pbxproj

+25-11
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
attributes = {
356356
BuildIndependentTargetsInParallel = 1;
357357
LastSwiftUpdateCheck = 1610;
358-
LastUpgradeCheck = 1610;
358+
LastUpgradeCheck = 1620;
359359
TargetAttributes = {
360360
961678FB2CFF100D00B2B6DF = {
361361
CreatedOnToolsVersion = 16.1;
@@ -546,6 +546,7 @@
546546
CLANG_WARN_UNREACHABLE_CODE = YES;
547547
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
548548
COPY_PHASE_STRIP = NO;
549+
DEAD_CODE_STRIPPING = YES;
549550
DEBUG_INFORMATION_FORMAT = dwarf;
550551
ENABLE_STRICT_OBJC_MSGSEND = YES;
551552
ENABLE_TESTABILITY = YES;
@@ -572,6 +573,7 @@
572573
SDKROOT = macosx;
573574
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
574575
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
576+
SWIFT_VERSION = 6.0;
575577
};
576578
name = Debug;
577579
};
@@ -609,6 +611,7 @@
609611
CLANG_WARN_UNREACHABLE_CODE = YES;
610612
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
611613
COPY_PHASE_STRIP = NO;
614+
DEAD_CODE_STRIPPING = YES;
612615
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
613616
ENABLE_NS_ASSERTIONS = NO;
614617
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -627,6 +630,7 @@
627630
MTL_FAST_MATH = YES;
628631
SDKROOT = macosx;
629632
SWIFT_COMPILATION_MODE = wholemodule;
633+
SWIFT_VERSION = 6.0;
630634
};
631635
name = Release;
632636
};
@@ -639,6 +643,7 @@
639643
CODE_SIGN_STYLE = Automatic;
640644
COMBINE_HIDPI_IMAGES = YES;
641645
CURRENT_PROJECT_VERSION = 1;
646+
DEAD_CODE_STRIPPING = YES;
642647
DEVELOPMENT_ASSET_PATHS = "\"Coder Desktop/Preview Content\"";
643648
DEVELOPMENT_TEAM = 4399GN35BJ;
644649
ENABLE_HARDENED_RUNTIME = YES;
@@ -655,7 +660,7 @@
655660
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop";
656661
PRODUCT_NAME = "$(TARGET_NAME)";
657662
SWIFT_EMIT_LOC_STRINGS = YES;
658-
SWIFT_VERSION = 5.0;
663+
SWIFT_VERSION = 6.0;
659664
};
660665
name = Debug;
661666
};
@@ -668,6 +673,7 @@
668673
CODE_SIGN_STYLE = Automatic;
669674
COMBINE_HIDPI_IMAGES = YES;
670675
CURRENT_PROJECT_VERSION = 1;
676+
DEAD_CODE_STRIPPING = YES;
671677
DEVELOPMENT_ASSET_PATHS = "\"Coder Desktop/Preview Content\"";
672678
DEVELOPMENT_TEAM = 4399GN35BJ;
673679
ENABLE_HARDENED_RUNTIME = YES;
@@ -684,7 +690,7 @@
684690
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop";
685691
PRODUCT_NAME = "$(TARGET_NAME)";
686692
SWIFT_EMIT_LOC_STRINGS = YES;
687-
SWIFT_VERSION = 5.0;
693+
SWIFT_VERSION = 6.0;
688694
};
689695
name = Release;
690696
};
@@ -694,14 +700,15 @@
694700
BUNDLE_LOADER = "$(TEST_HOST)";
695701
CODE_SIGN_STYLE = Automatic;
696702
CURRENT_PROJECT_VERSION = 1;
703+
DEAD_CODE_STRIPPING = YES;
697704
DEVELOPMENT_TEAM = 4399GN35BJ;
698705
GENERATE_INFOPLIST_FILE = YES;
699706
MACOSX_DEPLOYMENT_TARGET = 14.0;
700707
MARKETING_VERSION = 1.0;
701708
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-DesktopTests";
702709
PRODUCT_NAME = "$(TARGET_NAME)";
703710
SWIFT_EMIT_LOC_STRINGS = NO;
704-
SWIFT_VERSION = 5.0;
711+
SWIFT_VERSION = 6.0;
705712
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
706713
};
707714
name = Debug;
@@ -712,14 +719,15 @@
712719
BUNDLE_LOADER = "$(TEST_HOST)";
713720
CODE_SIGN_STYLE = Automatic;
714721
CURRENT_PROJECT_VERSION = 1;
722+
DEAD_CODE_STRIPPING = YES;
715723
DEVELOPMENT_TEAM = 4399GN35BJ;
716724
GENERATE_INFOPLIST_FILE = YES;
717725
MACOSX_DEPLOYMENT_TARGET = 14.0;
718726
MARKETING_VERSION = 1.0;
719727
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-DesktopTests";
720728
PRODUCT_NAME = "$(TARGET_NAME)";
721729
SWIFT_EMIT_LOC_STRINGS = NO;
722-
SWIFT_VERSION = 5.0;
730+
SWIFT_VERSION = 6.0;
723731
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
724732
};
725733
name = Release;
@@ -729,14 +737,15 @@
729737
buildSettings = {
730738
CODE_SIGN_STYLE = Automatic;
731739
CURRENT_PROJECT_VERSION = 1;
740+
DEAD_CODE_STRIPPING = YES;
732741
DEVELOPMENT_TEAM = 4399GN35BJ;
733742
GENERATE_INFOPLIST_FILE = YES;
734743
MACOSX_DEPLOYMENT_TARGET = 14.6;
735744
MARKETING_VERSION = 1.0;
736745
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-DesktopUITests";
737746
PRODUCT_NAME = "$(TARGET_NAME)";
738747
SWIFT_EMIT_LOC_STRINGS = NO;
739-
SWIFT_VERSION = 5.0;
748+
SWIFT_VERSION = 6.0;
740749
TEST_TARGET_NAME = "Coder Desktop";
741750
};
742751
name = Debug;
@@ -746,14 +755,15 @@
746755
buildSettings = {
747756
CODE_SIGN_STYLE = Automatic;
748757
CURRENT_PROJECT_VERSION = 1;
758+
DEAD_CODE_STRIPPING = YES;
749759
DEVELOPMENT_TEAM = 4399GN35BJ;
750760
GENERATE_INFOPLIST_FILE = YES;
751761
MACOSX_DEPLOYMENT_TARGET = 14.6;
752762
MARKETING_VERSION = 1.0;
753763
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-DesktopUITests";
754764
PRODUCT_NAME = "$(TARGET_NAME)";
755765
SWIFT_EMIT_LOC_STRINGS = NO;
756-
SWIFT_VERSION = 5.0;
766+
SWIFT_VERSION = 6.0;
757767
TEST_TARGET_NAME = "Coder Desktop";
758768
};
759769
name = Release;
@@ -764,6 +774,7 @@
764774
CODE_SIGN_ENTITLEMENTS = VPN/VPN.entitlements;
765775
CODE_SIGN_STYLE = Automatic;
766776
CURRENT_PROJECT_VERSION = 1;
777+
DEAD_CODE_STRIPPING = YES;
767778
DEVELOPMENT_TEAM = 4399GN35BJ;
768779
ENABLE_HARDENED_RUNTIME = YES;
769780
GENERATE_INFOPLIST_FILE = YES;
@@ -780,7 +791,7 @@
780791
PRODUCT_NAME = "$(inherited)";
781792
SKIP_INSTALL = YES;
782793
SWIFT_EMIT_LOC_STRINGS = YES;
783-
SWIFT_VERSION = 5.0;
794+
SWIFT_VERSION = 6.0;
784795
};
785796
name = Debug;
786797
};
@@ -790,6 +801,7 @@
790801
CODE_SIGN_ENTITLEMENTS = VPN/VPN.entitlements;
791802
CODE_SIGN_STYLE = Automatic;
792803
CURRENT_PROJECT_VERSION = 1;
804+
DEAD_CODE_STRIPPING = YES;
793805
DEVELOPMENT_TEAM = 4399GN35BJ;
794806
ENABLE_HARDENED_RUNTIME = YES;
795807
GENERATE_INFOPLIST_FILE = YES;
@@ -806,7 +818,7 @@
806818
PRODUCT_NAME = "$(inherited)";
807819
SKIP_INSTALL = YES;
808820
SWIFT_EMIT_LOC_STRINGS = YES;
809-
SWIFT_VERSION = 5.0;
821+
SWIFT_VERSION = 6.0;
810822
};
811823
name = Release;
812824
};
@@ -816,13 +828,14 @@
816828
BUNDLE_LOADER = "$(TEST_HOST)";
817829
CODE_SIGN_STYLE = Automatic;
818830
CURRENT_PROJECT_VERSION = 1;
831+
DEAD_CODE_STRIPPING = YES;
819832
DEVELOPMENT_TEAM = 4399GN35BJ;
820833
GENERATE_INFOPLIST_FILE = YES;
821834
MARKETING_VERSION = 1.0;
822835
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
823836
PRODUCT_NAME = "$(TARGET_NAME)";
824837
SWIFT_EMIT_LOC_STRINGS = NO;
825-
SWIFT_VERSION = 5.0;
838+
SWIFT_VERSION = 6.0;
826839
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
827840
};
828841
name = Debug;
@@ -833,13 +846,14 @@
833846
BUNDLE_LOADER = "$(TEST_HOST)";
834847
CODE_SIGN_STYLE = Automatic;
835848
CURRENT_PROJECT_VERSION = 1;
849+
DEAD_CODE_STRIPPING = YES;
836850
DEVELOPMENT_TEAM = 4399GN35BJ;
837851
GENERATE_INFOPLIST_FILE = YES;
838852
MARKETING_VERSION = 1.0;
839853
PRODUCT_BUNDLE_IDENTIFIER = "com.coder.Coder-Desktop.ProtoTests";
840854
PRODUCT_NAME = "$(TARGET_NAME)";
841855
SWIFT_EMIT_LOC_STRINGS = NO;
842-
SWIFT_VERSION = 5.0;
856+
SWIFT_VERSION = 6.0;
843857
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Coder Desktop.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Coder Desktop";
844858
};
845859
name = Release;

‎Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/Coder Desktop.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1610"
3+
LastUpgradeVersion = "1620"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Coder Desktop/Coder Desktop.xcodeproj/xcshareddata/xcschemes/ProtoTests.xcscheme

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1610"
3+
LastUpgradeVersion = "1620"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -54,15 +54,6 @@
5454
savedToolIdentifier = ""
5555
useCustomWorkingDirectory = "NO"
5656
debugDocumentVersioning = "YES">
57-
<MacroExpansion>
58-
<BuildableReference
59-
BuildableIdentifier = "primary"
60-
BlueprintIdentifier = "961678FB2CFF100D00B2B6DF"
61-
BuildableName = "Coder Desktop.app"
62-
BlueprintName = "Coder Desktop"
63-
ReferencedContainer = "container:Coder Desktop.xcodeproj">
64-
</BuildableReference>
65-
</MacroExpansion>
6657
</ProfileAction>
6758
<AnalyzeAction
6859
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)