Skip to content

Commit f258d3a

Browse files
thecoolwinterthecoolwinter
authored
Merge branch 'main' into feat/editor-restoration
2 parents f72e461 + 666d33b commit f258d3a

File tree

15 files changed

+557
-59
lines changed

15 files changed

+557
-59
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@
620620
CLANG_WARN_UNREACHABLE_CODE = YES;
621621
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
622622
COPY_PHASE_STRIP = NO;
623-
CURRENT_PROJECT_VERSION = 45;
623+
CURRENT_PROJECT_VERSION = 46;
624624
DEAD_CODE_STRIPPING = YES;
625625
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
626626
ENABLE_NS_ASSERTIONS = NO;
@@ -660,7 +660,7 @@
660660
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
661661
CODE_SIGN_STYLE = Automatic;
662662
COMBINE_HIDPI_IMAGES = YES;
663-
CURRENT_PROJECT_VERSION = 45;
663+
CURRENT_PROJECT_VERSION = 46;
664664
DEAD_CODE_STRIPPING = YES;
665665
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
666666
DEVELOPMENT_TEAM = "";
@@ -697,7 +697,7 @@
697697
BUNDLE_LOADER = "$(TEST_HOST)";
698698
CODE_SIGN_STYLE = Automatic;
699699
COMBINE_HIDPI_IMAGES = YES;
700-
CURRENT_PROJECT_VERSION = 45;
700+
CURRENT_PROJECT_VERSION = 46;
701701
DEAD_CODE_STRIPPING = YES;
702702
DEVELOPMENT_TEAM = "";
703703
GENERATE_INFOPLIST_FILE = YES;
@@ -725,7 +725,7 @@
725725
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
726726
CODE_SIGN_STYLE = Automatic;
727727
COMBINE_HIDPI_IMAGES = YES;
728-
CURRENT_PROJECT_VERSION = 45;
728+
CURRENT_PROJECT_VERSION = 46;
729729
DEAD_CODE_STRIPPING = YES;
730730
DEVELOPMENT_TEAM = "";
731731
GENERATE_INFOPLIST_FILE = YES;
@@ -754,7 +754,7 @@
754754
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
755755
CODE_SIGN_STYLE = Automatic;
756756
COMBINE_HIDPI_IMAGES = YES;
757-
CURRENT_PROJECT_VERSION = 45;
757+
CURRENT_PROJECT_VERSION = 46;
758758
DEAD_CODE_STRIPPING = YES;
759759
DEVELOPMENT_TEAM = "";
760760
ENABLE_HARDENED_RUNTIME = YES;
@@ -817,7 +817,7 @@
817817
CLANG_WARN_UNREACHABLE_CODE = YES;
818818
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
819819
COPY_PHASE_STRIP = NO;
820-
CURRENT_PROJECT_VERSION = 45;
820+
CURRENT_PROJECT_VERSION = 46;
821821
DEAD_CODE_STRIPPING = YES;
822822
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
823823
ENABLE_NS_ASSERTIONS = NO;
@@ -857,7 +857,7 @@
857857
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
858858
CODE_SIGN_STYLE = Automatic;
859859
COMBINE_HIDPI_IMAGES = YES;
860-
CURRENT_PROJECT_VERSION = 45;
860+
CURRENT_PROJECT_VERSION = 46;
861861
DEAD_CODE_STRIPPING = YES;
862862
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
863863
DEVELOPMENT_TEAM = "";
@@ -894,7 +894,7 @@
894894
BUNDLE_LOADER = "$(TEST_HOST)";
895895
CODE_SIGN_STYLE = Automatic;
896896
COMBINE_HIDPI_IMAGES = YES;
897-
CURRENT_PROJECT_VERSION = 45;
897+
CURRENT_PROJECT_VERSION = 46;
898898
DEAD_CODE_STRIPPING = YES;
899899
DEVELOPMENT_TEAM = "";
900900
GENERATE_INFOPLIST_FILE = YES;
@@ -922,7 +922,7 @@
922922
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
923923
CODE_SIGN_STYLE = Automatic;
924924
COMBINE_HIDPI_IMAGES = YES;
925-
CURRENT_PROJECT_VERSION = 45;
925+
CURRENT_PROJECT_VERSION = 46;
926926
DEAD_CODE_STRIPPING = YES;
927927
DEVELOPMENT_TEAM = "";
928928
GENERATE_INFOPLIST_FILE = YES;
@@ -951,7 +951,7 @@
951951
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
952952
CODE_SIGN_STYLE = Automatic;
953953
COMBINE_HIDPI_IMAGES = YES;
954-
CURRENT_PROJECT_VERSION = 45;
954+
CURRENT_PROJECT_VERSION = 46;
955955
DEAD_CODE_STRIPPING = YES;
956956
DEVELOPMENT_TEAM = "";
957957
ENABLE_HARDENED_RUNTIME = YES;
@@ -986,7 +986,7 @@
986986
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
987987
CODE_SIGN_STYLE = Automatic;
988988
COMBINE_HIDPI_IMAGES = YES;
989-
CURRENT_PROJECT_VERSION = 45;
989+
CURRENT_PROJECT_VERSION = 46;
990990
DEAD_CODE_STRIPPING = YES;
991991
DEVELOPMENT_TEAM = "";
992992
ENABLE_HARDENED_RUNTIME = YES;
@@ -1021,7 +1021,7 @@
10211021
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
10221022
CODE_SIGN_STYLE = Automatic;
10231023
COMBINE_HIDPI_IMAGES = YES;
1024-
CURRENT_PROJECT_VERSION = 45;
1024+
CURRENT_PROJECT_VERSION = 46;
10251025
DEAD_CODE_STRIPPING = YES;
10261026
DEVELOPMENT_TEAM = "";
10271027
ENABLE_HARDENED_RUNTIME = YES;
@@ -1085,7 +1085,7 @@
10851085
CLANG_WARN_UNREACHABLE_CODE = YES;
10861086
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10871087
COPY_PHASE_STRIP = NO;
1088-
CURRENT_PROJECT_VERSION = 45;
1088+
CURRENT_PROJECT_VERSION = 46;
10891089
DEAD_CODE_STRIPPING = YES;
10901090
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10911091
ENABLE_NS_ASSERTIONS = NO;
@@ -1126,7 +1126,7 @@
11261126
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11271127
CODE_SIGN_STYLE = Automatic;
11281128
COMBINE_HIDPI_IMAGES = YES;
1129-
CURRENT_PROJECT_VERSION = 45;
1129+
CURRENT_PROJECT_VERSION = 46;
11301130
DEAD_CODE_STRIPPING = YES;
11311131
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11321132
DEVELOPMENT_TEAM = "";
@@ -1163,7 +1163,7 @@
11631163
BUNDLE_LOADER = "$(TEST_HOST)";
11641164
CODE_SIGN_STYLE = Automatic;
11651165
COMBINE_HIDPI_IMAGES = YES;
1166-
CURRENT_PROJECT_VERSION = 45;
1166+
CURRENT_PROJECT_VERSION = 46;
11671167
DEAD_CODE_STRIPPING = YES;
11681168
DEVELOPMENT_TEAM = "";
11691169
GENERATE_INFOPLIST_FILE = YES;
@@ -1191,7 +1191,7 @@
11911191
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11921192
CODE_SIGN_STYLE = Automatic;
11931193
COMBINE_HIDPI_IMAGES = YES;
1194-
CURRENT_PROJECT_VERSION = 45;
1194+
CURRENT_PROJECT_VERSION = 46;
11951195
DEAD_CODE_STRIPPING = YES;
11961196
DEVELOPMENT_TEAM = "";
11971197
GENERATE_INFOPLIST_FILE = YES;
@@ -1220,7 +1220,7 @@
12201220
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12211221
CODE_SIGN_STYLE = Automatic;
12221222
COMBINE_HIDPI_IMAGES = YES;
1223-
CURRENT_PROJECT_VERSION = 45;
1223+
CURRENT_PROJECT_VERSION = 46;
12241224
DEAD_CODE_STRIPPING = YES;
12251225
DEVELOPMENT_TEAM = "";
12261226
ENABLE_HARDENED_RUNTIME = YES;
@@ -1283,7 +1283,7 @@
12831283
CLANG_WARN_UNREACHABLE_CODE = YES;
12841284
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12851285
COPY_PHASE_STRIP = NO;
1286-
CURRENT_PROJECT_VERSION = 45;
1286+
CURRENT_PROJECT_VERSION = 46;
12871287
DEAD_CODE_STRIPPING = YES;
12881288
DEBUG_INFORMATION_FORMAT = dwarf;
12891289
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1355,7 +1355,7 @@
13551355
CLANG_WARN_UNREACHABLE_CODE = YES;
13561356
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13571357
COPY_PHASE_STRIP = NO;
1358-
CURRENT_PROJECT_VERSION = 45;
1358+
CURRENT_PROJECT_VERSION = 46;
13591359
DEAD_CODE_STRIPPING = YES;
13601360
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13611361
ENABLE_NS_ASSERTIONS = NO;
@@ -1394,7 +1394,7 @@
13941394
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
13951395
CODE_SIGN_STYLE = Automatic;
13961396
COMBINE_HIDPI_IMAGES = YES;
1397-
CURRENT_PROJECT_VERSION = 45;
1397+
CURRENT_PROJECT_VERSION = 46;
13981398
DEAD_CODE_STRIPPING = YES;
13991399
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14001400
DEVELOPMENT_TEAM = "";
@@ -1435,7 +1435,7 @@
14351435
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
14361436
CODE_SIGN_STYLE = Automatic;
14371437
COMBINE_HIDPI_IMAGES = YES;
1438-
CURRENT_PROJECT_VERSION = 45;
1438+
CURRENT_PROJECT_VERSION = 46;
14391439
DEAD_CODE_STRIPPING = YES;
14401440
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14411441
DEVELOPMENT_TEAM = "";
@@ -1472,7 +1472,7 @@
14721472
BUNDLE_LOADER = "$(TEST_HOST)";
14731473
CODE_SIGN_STYLE = Automatic;
14741474
COMBINE_HIDPI_IMAGES = YES;
1475-
CURRENT_PROJECT_VERSION = 45;
1475+
CURRENT_PROJECT_VERSION = 46;
14761476
DEAD_CODE_STRIPPING = YES;
14771477
DEVELOPMENT_TEAM = "";
14781478
GENERATE_INFOPLIST_FILE = YES;
@@ -1499,7 +1499,7 @@
14991499
BUNDLE_LOADER = "$(TEST_HOST)";
15001500
CODE_SIGN_STYLE = Automatic;
15011501
COMBINE_HIDPI_IMAGES = YES;
1502-
CURRENT_PROJECT_VERSION = 45;
1502+
CURRENT_PROJECT_VERSION = 46;
15031503
DEAD_CODE_STRIPPING = YES;
15041504
DEVELOPMENT_TEAM = "";
15051505
GENERATE_INFOPLIST_FILE = YES;
@@ -1527,7 +1527,7 @@
15271527
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15281528
CODE_SIGN_STYLE = Automatic;
15291529
COMBINE_HIDPI_IMAGES = YES;
1530-
CURRENT_PROJECT_VERSION = 45;
1530+
CURRENT_PROJECT_VERSION = 46;
15311531
DEAD_CODE_STRIPPING = YES;
15321532
DEVELOPMENT_TEAM = "";
15331533
GENERATE_INFOPLIST_FILE = YES;
@@ -1556,7 +1556,7 @@
15561556
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15571557
CODE_SIGN_STYLE = Automatic;
15581558
COMBINE_HIDPI_IMAGES = YES;
1559-
CURRENT_PROJECT_VERSION = 45;
1559+
CURRENT_PROJECT_VERSION = 46;
15601560
DEAD_CODE_STRIPPING = YES;
15611561
DEVELOPMENT_TEAM = "";
15621562
GENERATE_INFOPLIST_FILE = YES;

0 commit comments

Comments
 (0)