Skip to content

Commit 1d590a9

Browse files
thecoolwinterthecoolwinter
committed
Update Project, Use local WelcomeWindow for now
1 parent 05704cb commit 1d590a9

File tree

5 files changed

+44
-34
lines changed

5 files changed

+44
-34
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
58F2EB03292FB2B0004A9BDE /* Documentation.docc in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EACE292FB2B0004A9BDE /* Documentation.docc */; };
1919
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB1D292FB954004A9BDE /* Sparkle */; };
2020
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5E4485602DF600D9008BBE69 /* AboutWindow */; };
21-
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5EACE6212DF4BF08005E08B8 /* WelcomeWindow */; };
2221
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; };
2322
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
2423
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
2524
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */; };
25+
6C33D9FB2E5F9184007782E7 /* WelcomeWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 6C33D9FA2E5F9184007782E7 /* WelcomeWindow */; };
2626
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
2727
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F329CD142C00235D17 /* CollectionConcurrencyKit */; };
2828
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F729CD14D100235D17 /* CodeEditKit */; };
@@ -187,12 +187,12 @@
187187
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
188188
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
189189
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
190+
6C33D9FB2E5F9184007782E7 /* WelcomeWindow in Frameworks */,
190191
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
191192
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
192193
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */,
193194
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
194195
30CB64942C16CA9100CC8A9E /* LanguageClient in Frameworks */,
195-
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */,
196196
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */,
197197
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
198198
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
@@ -331,12 +331,12 @@
331331
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
332332
30818CB42D4E563900967860 /* ZIPFoundation */,
333333
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
334-
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */,
335334
5E4485602DF600D9008BBE69 /* AboutWindow */,
336335
6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */,
337336
6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */,
338337
6CCF6DD22E26D48F00B94F75 /* SwiftTerm */,
339338
6CCF73CF2E26DE3200B94F75 /* SwiftTerm */,
339+
6C33D9FA2E5F9184007782E7 /* WelcomeWindow */,
340340
);
341341
productName = CodeEdit;
342342
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -397,7 +397,7 @@
397397
attributes = {
398398
BuildIndependentTargetsInParallel = 1;
399399
LastSwiftUpdateCheck = 1330;
400-
LastUpgradeCheck = 1640;
400+
LastUpgradeCheck = 2600;
401401
TargetAttributes = {
402402
2BE487EB28245162003F3F64 = {
403403
CreatedOnToolsVersion = 13.3.1;
@@ -439,10 +439,10 @@
439439
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
440440
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
441441
30ED7B722DD299E600ACC922 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
442-
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
443442
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
444443
6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
445444
6CCF73CE2E26DE3200B94F75 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
445+
6C33D9F92E5F9184007782E7 /* XCLocalSwiftPackageReference "../WelcomeWindow" */,
446446
);
447447
preferredProjectObjectVersion = 55;
448448
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -650,6 +650,7 @@
650650
OTHER_SWIFT_FLAGS = "-D ALPHA";
651651
RUN_DOCUMENTATION_COMPILER = YES;
652652
SDKROOT = macosx;
653+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
653654
SWIFT_COMPILATION_MODE = wholemodule;
654655
SWIFT_OPTIMIZATION_LEVEL = "-O";
655656
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -673,6 +674,7 @@
673674
DEAD_CODE_STRIPPING = YES;
674675
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
675676
DEVELOPMENT_TEAM = "";
677+
ENABLE_APP_SANDBOX = NO;
676678
ENABLE_HARDENED_RUNTIME = YES;
677679
ENABLE_PREVIEWS = YES;
678680
GENERATE_INFOPLIST_FILE = NO;
@@ -690,6 +692,8 @@
690692
PRODUCT_NAME = "$(TARGET_NAME)";
691693
PROVISIONING_PROFILE_SPECIFIER = "";
692694
REGISTER_APP_GROUPS = YES;
695+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
696+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
693697
RUN_DOCUMENTATION_COMPILER = NO;
694698
SWIFT_EMIT_LOC_STRINGS = YES;
695699
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -766,6 +770,7 @@
766770
CURRENT_PROJECT_VERSION = 47;
767771
DEAD_CODE_STRIPPING = YES;
768772
DEVELOPMENT_TEAM = "";
773+
ENABLE_APP_SANDBOX = NO;
769774
ENABLE_HARDENED_RUNTIME = YES;
770775
GENERATE_INFOPLIST_FILE = NO;
771776
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
@@ -847,6 +852,7 @@
847852
OTHER_SWIFT_FLAGS = "-D BETA";
848853
RUN_DOCUMENTATION_COMPILER = YES;
849854
SDKROOT = macosx;
855+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
850856
SWIFT_COMPILATION_MODE = wholemodule;
851857
SWIFT_OPTIMIZATION_LEVEL = "-O";
852858
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -870,6 +876,7 @@
870876
DEAD_CODE_STRIPPING = YES;
871877
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
872878
DEVELOPMENT_TEAM = "";
879+
ENABLE_APP_SANDBOX = NO;
873880
ENABLE_HARDENED_RUNTIME = YES;
874881
ENABLE_PREVIEWS = YES;
875882
GENERATE_INFOPLIST_FILE = NO;
@@ -887,6 +894,8 @@
887894
PRODUCT_NAME = "$(TARGET_NAME)";
888895
PROVISIONING_PROFILE_SPECIFIER = "";
889896
REGISTER_APP_GROUPS = YES;
897+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
898+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
890899
RUN_DOCUMENTATION_COMPILER = NO;
891900
SWIFT_EMIT_LOC_STRINGS = YES;
892901
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -963,6 +972,7 @@
963972
CURRENT_PROJECT_VERSION = 47;
964973
DEAD_CODE_STRIPPING = YES;
965974
DEVELOPMENT_TEAM = "";
975+
ENABLE_APP_SANDBOX = NO;
966976
ENABLE_HARDENED_RUNTIME = YES;
967977
GENERATE_INFOPLIST_FILE = NO;
968978
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
@@ -998,6 +1008,7 @@
9981008
CURRENT_PROJECT_VERSION = 47;
9991009
DEAD_CODE_STRIPPING = YES;
10001010
DEVELOPMENT_TEAM = "";
1011+
ENABLE_APP_SANDBOX = NO;
10011012
ENABLE_HARDENED_RUNTIME = YES;
10021013
GENERATE_INFOPLIST_FILE = NO;
10031014
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
@@ -1033,6 +1044,7 @@
10331044
CURRENT_PROJECT_VERSION = 47;
10341045
DEAD_CODE_STRIPPING = YES;
10351046
DEVELOPMENT_TEAM = "";
1047+
ENABLE_APP_SANDBOX = NO;
10361048
ENABLE_HARDENED_RUNTIME = YES;
10371049
GENERATE_INFOPLIST_FILE = NO;
10381050
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
@@ -1115,6 +1127,7 @@
11151127
OTHER_SWIFT_FLAGS = "-D ALPHA";
11161128
RUN_DOCUMENTATION_COMPILER = YES;
11171129
SDKROOT = macosx;
1130+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
11181131
SWIFT_COMPILATION_MODE = wholemodule;
11191132
SWIFT_OPTIMIZATION_LEVEL = "-O";
11201133
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1139,6 +1152,7 @@
11391152
DEAD_CODE_STRIPPING = YES;
11401153
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11411154
DEVELOPMENT_TEAM = "";
1155+
ENABLE_APP_SANDBOX = NO;
11421156
ENABLE_HARDENED_RUNTIME = YES;
11431157
ENABLE_PREVIEWS = YES;
11441158
GENERATE_INFOPLIST_FILE = NO;
@@ -1156,6 +1170,8 @@
11561170
PRODUCT_NAME = "$(TARGET_NAME)";
11571171
PROVISIONING_PROFILE_SPECIFIER = "";
11581172
REGISTER_APP_GROUPS = YES;
1173+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1174+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
11591175
RUN_DOCUMENTATION_COMPILER = NO;
11601176
SWIFT_EMIT_LOC_STRINGS = YES;
11611177
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1232,6 +1248,7 @@
12321248
CURRENT_PROJECT_VERSION = 47;
12331249
DEAD_CODE_STRIPPING = YES;
12341250
DEVELOPMENT_TEAM = "";
1251+
ENABLE_APP_SANDBOX = NO;
12351252
ENABLE_HARDENED_RUNTIME = YES;
12361253
GENERATE_INFOPLIST_FILE = NO;
12371254
INFOPLIST_FILE = OpenWithCodeEdit/Info.plist;
@@ -1319,6 +1336,7 @@
13191336
ONLY_ACTIVE_ARCH = YES;
13201337
RUN_DOCUMENTATION_COMPILER = YES;
13211338
SDKROOT = macosx;
1339+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
13221340
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
13231341
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
13241342
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1384,6 +1402,7 @@
13841402
MTL_FAST_MATH = YES;
13851403
RUN_DOCUMENTATION_COMPILER = YES;
13861404
SDKROOT = macosx;
1405+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
13871406
SWIFT_COMPILATION_MODE = wholemodule;
13881407
SWIFT_OPTIMIZATION_LEVEL = "-O";
13891408
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1407,6 +1426,7 @@
14071426
DEAD_CODE_STRIPPING = YES;
14081427
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14091428
DEVELOPMENT_TEAM = "";
1429+
ENABLE_APP_SANDBOX = NO;
14101430
ENABLE_HARDENED_RUNTIME = YES;
14111431
ENABLE_PREVIEWS = YES;
14121432
GENERATE_INFOPLIST_FILE = NO;
@@ -1424,6 +1444,8 @@
14241444
PRODUCT_NAME = "$(TARGET_NAME)";
14251445
PROVISIONING_PROFILE_SPECIFIER = "";
14261446
REGISTER_APP_GROUPS = YES;
1447+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1448+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
14271449
RUN_DOCUMENTATION_COMPILER = NO;
14281450
SWIFT_EMIT_LOC_STRINGS = YES;
14291451
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1448,6 +1470,7 @@
14481470
DEAD_CODE_STRIPPING = YES;
14491471
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14501472
DEVELOPMENT_TEAM = "";
1473+
ENABLE_APP_SANDBOX = NO;
14511474
ENABLE_HARDENED_RUNTIME = YES;
14521475
ENABLE_PREVIEWS = YES;
14531476
GENERATE_INFOPLIST_FILE = NO;
@@ -1465,6 +1488,8 @@
14651488
PRODUCT_NAME = "$(TARGET_NAME)";
14661489
PROVISIONING_PROFILE_SPECIFIER = "";
14671490
REGISTER_APP_GROUPS = YES;
1491+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1492+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
14681493
RUN_DOCUMENTATION_COMPILER = NO;
14691494
SWIFT_EMIT_LOC_STRINGS = YES;
14701495
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1649,6 +1674,13 @@
16491674
};
16501675
/* End XCConfigurationList section */
16511676

1677+
/* Begin XCLocalSwiftPackageReference section */
1678+
6C33D9F92E5F9184007782E7 /* XCLocalSwiftPackageReference "../WelcomeWindow" */ = {
1679+
isa = XCLocalSwiftPackageReference;
1680+
relativePath = ../WelcomeWindow;
1681+
};
1682+
/* End XCLocalSwiftPackageReference section */
1683+
16521684
/* Begin XCRemoteSwiftPackageReference section */
16531685
2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
16541686
isa = XCRemoteSwiftPackageReference;
@@ -1738,14 +1770,6 @@
17381770
minimumVersion = 1.0.0;
17391771
};
17401772
};
1741-
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */ = {
1742-
isa = XCRemoteSwiftPackageReference;
1743-
repositoryURL = "https://github.com/CodeEditApp/WelcomeWindow";
1744-
requirement = {
1745-
kind = upToNextMajorVersion;
1746-
minimumVersion = 1.0.0;
1747-
};
1748-
};
17491773
6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = {
17501774
isa = XCRemoteSwiftPackageReference;
17511775
repositoryURL = "https://github.com/Wouter01/LogStream";
@@ -1864,11 +1888,6 @@
18641888
package = 5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */;
18651889
productName = AboutWindow;
18661890
};
1867-
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */ = {
1868-
isa = XCSwiftPackageProductDependency;
1869-
package = 5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */;
1870-
productName = WelcomeWindow;
1871-
};
18721891
6C0617D52BDB4432008C9C42 /* LogStream */ = {
18731892
isa = XCSwiftPackageProductDependency;
18741893
package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */;
@@ -1887,6 +1906,10 @@
18871906
isa = XCSwiftPackageProductDependency;
18881907
productName = CodeEditSourceEditor;
18891908
};
1909+
6C33D9FA2E5F9184007782E7 /* WelcomeWindow */ = {
1910+
isa = XCSwiftPackageProductDependency;
1911+
productName = WelcomeWindow;
1912+
};
18901913
6C66C31229D05CDC00DE9ED2 /* GRDB */ = {
18911914
isa = XCSwiftPackageProductDependency;
18921915
package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */;

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 1 addition & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1640"
3+
LastUpgradeVersion = "2600"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/OpenWithCodeEdit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1620"
3+
LastUpgradeVersion = "2600"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎OpenWithCodeEdit/OpenWithCodeEdit.entitlements‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>com.apple.security.app-sandbox</key>
6-
<true/>
75
<key>com.apple.security.application-groups</key>
86
<array>
97
<string>app.codeedit.CodeEdit.shared</string>
108
<string>$(TeamIdentifierPrefix)</string>
119
</array>
12-
<key>com.apple.security.files.user-selected.read-only</key>
13-
<true/>
1410
</dict>
1511
</plist>

0 commit comments

Comments
 (0)