Skip to content

Commit 636ead0

Browse files
vksvickyvksvicky
committed
Fix: Resolve deprecation warnings and unreachable code
- Updated 80+ instances of onChange(of:perform:) to use the new macOS 14.0+ syntax with two-parameter closures (_, newValue in) - Commented out unreachable code in LSPService.swift after early return - Updated Xcode project settings to version 16.1 (LastUpgradeCheck: 2610) - Enabled app sandbox and JIT runtime exceptions for proper execution - Added string catalog symbol generation This resolves all deprecation warnings when targeting macOS 14.0+. Files affected: 39 files Changes: 95 insertions(+), 76 deletions(-)
1 parent aad6716 commit 636ead0

39 files changed

Lines changed: 95 additions & 76 deletions

File tree

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@
397397
attributes = {
398398
BuildIndependentTargetsInParallel = 1;
399399
LastSwiftUpdateCheck = 1330;
400-
LastUpgradeCheck = 1640;
400+
LastUpgradeCheck = 2610;
401401
TargetAttributes = {
402402
2BE487EB28245162003F3F64 = {
403403
CreatedOnToolsVersion = 13.3.1;
@@ -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 = YES;
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 = "";
@@ -847,6 +851,7 @@
847851
OTHER_SWIFT_FLAGS = "-D BETA";
848852
RUN_DOCUMENTATION_COMPILER = YES;
849853
SDKROOT = macosx;
854+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
850855
SWIFT_COMPILATION_MODE = wholemodule;
851856
SWIFT_OPTIMIZATION_LEVEL = "-O";
852857
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -870,6 +875,7 @@
870875
DEAD_CODE_STRIPPING = YES;
871876
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
872877
DEVELOPMENT_TEAM = "";
878+
ENABLE_APP_SANDBOX = YES;
873879
ENABLE_HARDENED_RUNTIME = YES;
874880
ENABLE_PREVIEWS = YES;
875881
GENERATE_INFOPLIST_FILE = NO;
@@ -887,6 +893,8 @@
887893
PRODUCT_NAME = "$(TARGET_NAME)";
888894
PROVISIONING_PROFILE_SPECIFIER = "";
889895
REGISTER_APP_GROUPS = YES;
896+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
897+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
890898
RUN_DOCUMENTATION_COMPILER = NO;
891899
SWIFT_EMIT_LOC_STRINGS = YES;
892900
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1115,6 +1123,7 @@
11151123
OTHER_SWIFT_FLAGS = "-D ALPHA";
11161124
RUN_DOCUMENTATION_COMPILER = YES;
11171125
SDKROOT = macosx;
1126+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
11181127
SWIFT_COMPILATION_MODE = wholemodule;
11191128
SWIFT_OPTIMIZATION_LEVEL = "-O";
11201129
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1139,6 +1148,7 @@
11391148
DEAD_CODE_STRIPPING = YES;
11401149
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11411150
DEVELOPMENT_TEAM = "";
1151+
ENABLE_APP_SANDBOX = YES;
11421152
ENABLE_HARDENED_RUNTIME = YES;
11431153
ENABLE_PREVIEWS = YES;
11441154
GENERATE_INFOPLIST_FILE = NO;
@@ -1156,6 +1166,8 @@
11561166
PRODUCT_NAME = "$(TARGET_NAME)";
11571167
PROVISIONING_PROFILE_SPECIFIER = "";
11581168
REGISTER_APP_GROUPS = YES;
1169+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1170+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
11591171
RUN_DOCUMENTATION_COMPILER = NO;
11601172
SWIFT_EMIT_LOC_STRINGS = YES;
11611173
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1319,6 +1331,7 @@
13191331
ONLY_ACTIVE_ARCH = YES;
13201332
RUN_DOCUMENTATION_COMPILER = YES;
13211333
SDKROOT = macosx;
1334+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
13221335
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
13231336
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
13241337
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1384,6 +1397,7 @@
13841397
MTL_FAST_MATH = YES;
13851398
RUN_DOCUMENTATION_COMPILER = YES;
13861399
SDKROOT = macosx;
1400+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
13871401
SWIFT_COMPILATION_MODE = wholemodule;
13881402
SWIFT_OPTIMIZATION_LEVEL = "-O";
13891403
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
@@ -1407,6 +1421,7 @@
14071421
DEAD_CODE_STRIPPING = YES;
14081422
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14091423
DEVELOPMENT_TEAM = "";
1424+
ENABLE_APP_SANDBOX = YES;
14101425
ENABLE_HARDENED_RUNTIME = YES;
14111426
ENABLE_PREVIEWS = YES;
14121427
GENERATE_INFOPLIST_FILE = NO;
@@ -1424,6 +1439,8 @@
14241439
PRODUCT_NAME = "$(TARGET_NAME)";
14251440
PROVISIONING_PROFILE_SPECIFIER = "";
14261441
REGISTER_APP_GROUPS = YES;
1442+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1443+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
14271444
RUN_DOCUMENTATION_COMPILER = NO;
14281445
SWIFT_EMIT_LOC_STRINGS = YES;
14291446
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1448,6 +1465,7 @@
14481465
DEAD_CODE_STRIPPING = YES;
14491466
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14501467
DEVELOPMENT_TEAM = "";
1468+
ENABLE_APP_SANDBOX = YES;
14511469
ENABLE_HARDENED_RUNTIME = YES;
14521470
ENABLE_PREVIEWS = YES;
14531471
GENERATE_INFOPLIST_FILE = NO;
@@ -1465,6 +1483,8 @@
14651483
PRODUCT_NAME = "$(TARGET_NAME)";
14661484
PROVISIONING_PROFILE_SPECIFIER = "";
14671485
REGISTER_APP_GROUPS = YES;
1486+
RUNTIME_EXCEPTION_ALLOW_JIT = YES;
1487+
RUNTIME_EXCEPTION_DISABLE_LIBRARY_VALIDATION = YES;
14681488
RUN_DOCUMENTATION_COMPILER = NO;
14691489
SWIFT_EMIT_LOC_STRINGS = YES;
14701490
SWIFT_OBJC_BRIDGING_HEADER = "";

‎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 = "2600"
3+
LastUpgradeVersion = "2610"
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 = "2600"
3+
LastUpgradeVersion = "2610"
44
wasCreatedForAppExtension = "YES"
55
version = "2.0">
66
<BuildAction

‎CodeEdit/CodeEdit.entitlements‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
<string>app.codeedit.CodeEdit.shared</string>
88
<string>$(TeamIdentifierPrefix)</string>
99
</array>
10-
<key>com.apple.security.cs.allow-jit</key>
11-
<true/>
12-
<key>com.apple.security.cs.disable-library-validation</key>
13-
<true/>
1410
</dict>
1511
</plist>

‎CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct TaskNotificationView: View {
4949
}
5050
}
5151
.animation(.easeInOut, value: notification)
52-
.onChange(of: taskNotificationHandler.notifications) { newValue in
52+
.onChange(of: taskNotificationHandler.notifications) { _, newValue in
5353
withAnimation {
5454
notification = newValue.first
5555
}

‎CodeEdit/Features/ActivityViewer/Notifications/TaskNotificationsDetailView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct TaskNotificationsDetailView: View {
3535
}
3636
.padding(15)
3737
.frame(minWidth: 320)
38-
.onChange(of: taskNotificationHandler.notifications) { newValue in
38+
.onChange(of: taskNotificationHandler.notifications) { _, newValue in
3939
if selectedTaskNotificationIndex >= newValue.count {
4040
selectedTaskNotificationIndex = 0
4141
}

‎CodeEdit/Features/CEWorkspaceSettings/Views/EnvironmentVariableListItem.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct EnvironmentVariableListItem: View {
5050
.autocorrectionDisabled()
5151
.labelsHidden()
5252
}
53-
.onChange(of: isKeyFocused) { isFocused in
53+
.onChange(of: isKeyFocused) { _, isFocused in
5454
if isFocused {
5555
if selectedEnvID != environmentVariable.id {
5656
selectedEnvID = environmentVariable.id
@@ -62,10 +62,10 @@ struct EnvironmentVariableListItem: View {
6262
}
6363
}
6464
}
65-
.onChange(of: key) { newValue in
65+
.onChange(of: key) { _, newValue in
6666
environmentVariable.key = newValue
6767
}
68-
.onChange(of: value) { newValue in
68+
.onChange(of: value) { _, newValue in
6969
environmentVariable.value = newValue
7070
}
7171
}

‎CodeEdit/Features/CodeEditUI/Views/KeyValueTable.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ struct KeyValueTable<Header: View, ActionBarView: View>: View {
203203
}
204204
selection = []
205205
}
206-
.onChange(of: items) { newValue in
206+
.onChange(of: items) { _, newValue in
207207
updateTableItems(newValue)
208208
}
209209
}

‎CodeEdit/Features/CodeEditUI/Views/WorkspacePanelTabBar.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
284284
.onChange(of: geometry.frame(in: .global)) { newFrame in
285285
self.tabLocations[tab] = newFrame
286286
}
287-
.onChange(of: geometry.size.width) { newWidth in
287+
.onChange(of: geometry.size.width) { _, newWidth in
288288
self.tabWidth[tab] = newWidth
289289
}
290290
}

‎CodeEdit/Features/Editor/JumpBar/Views/EditorJumpBarView.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ struct EditorJumpBarView: View {
8888
textWidth = proxy.size.width
8989
}
9090
}
91-
.onChange(of: proxy.size.width) { newValue in
91+
.onChange(of: proxy.size.width) { _, newValue in
9292
if crumbWidth == nil {
9393
textWidth = newValue
9494
}
@@ -99,15 +99,15 @@ struct EditorJumpBarView: View {
9999
.onAppear {
100100
containerWidth = containerProxy.size.width
101101
}
102-
.onChange(of: containerProxy.size.width) { newValue in
102+
.onChange(of: containerProxy.size.width) { _, newValue in
103103
containerWidth = newValue
104104
}
105-
.onChange(of: textWidth) { _ in
105+
.onChange(of: textWidth) { _, _ in
106106
withAnimation(.easeInOut(duration: 0.2)) {
107107
resize()
108108
}
109109
}
110-
.onChange(of: containerWidth) { _ in
110+
.onChange(of: containerWidth) { _, _ in
111111
withAnimation(.easeInOut(duration: 0.2)) {
112112
resize()
113113
}

0 commit comments

Comments
 (0)