Skip to content

Commit fff0d7a

Browse files
xhuntxxhuntx
authored
Merge branch 'main' into main
2 parents 78d8a16 + 78c3be9 commit fff0d7a

40 files changed

Lines changed: 115 additions & 106 deletions

File tree

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@
643643
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
644644
GCC_WARN_UNUSED_FUNCTION = YES;
645645
GCC_WARN_UNUSED_VARIABLE = YES;
646-
MACOSX_DEPLOYMENT_TARGET = 13.0;
646+
MACOSX_DEPLOYMENT_TARGET = 14.0;
647647
MARKETING_VERSION = "";
648648
MTL_ENABLE_DEBUG_INFO = NO;
649649
MTL_FAST_MATH = YES;
@@ -686,7 +686,7 @@
686686
"$(inherited)",
687687
"@executable_path/../Frameworks",
688688
);
689-
MACOSX_DEPLOYMENT_TARGET = 13.0;
689+
MACOSX_DEPLOYMENT_TARGET = 14.0;
690690
MARKETING_VERSION = "Change in Info.plist";
691691
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
692692
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -719,7 +719,7 @@
719719
"@executable_path/../Frameworks",
720720
"@loader_path/../Frameworks",
721721
);
722-
MACOSX_DEPLOYMENT_TARGET = 13.0;
722+
MACOSX_DEPLOYMENT_TARGET = 14.0;
723723
MARKETING_VERSION = 1.0;
724724
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
725725
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -781,7 +781,7 @@
781781
"@executable_path/../Frameworks",
782782
"@executable_path/../../../../Frameworks",
783783
);
784-
MACOSX_DEPLOYMENT_TARGET = 13.0;
784+
MACOSX_DEPLOYMENT_TARGET = 14.0;
785785
MARKETING_VERSION = 1.0;
786786
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
787787
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -844,7 +844,7 @@
844844
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
845845
GCC_WARN_UNUSED_FUNCTION = YES;
846846
GCC_WARN_UNUSED_VARIABLE = YES;
847-
MACOSX_DEPLOYMENT_TARGET = 13.0;
847+
MACOSX_DEPLOYMENT_TARGET = 14.0;
848848
MARKETING_VERSION = "";
849849
MTL_ENABLE_DEBUG_INFO = NO;
850850
MTL_FAST_MATH = YES;
@@ -887,7 +887,7 @@
887887
"$(inherited)",
888888
"@executable_path/../Frameworks",
889889
);
890-
MACOSX_DEPLOYMENT_TARGET = 13.0;
890+
MACOSX_DEPLOYMENT_TARGET = 14.0;
891891
MARKETING_VERSION = "Change in Info.plist";
892892
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
893893
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -920,7 +920,7 @@
920920
"@executable_path/../Frameworks",
921921
"@loader_path/../Frameworks",
922922
);
923-
MACOSX_DEPLOYMENT_TARGET = 13.0;
923+
MACOSX_DEPLOYMENT_TARGET = 14.0;
924924
MARKETING_VERSION = 1.0;
925925
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
926926
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -982,7 +982,7 @@
982982
"@executable_path/../Frameworks",
983983
"@executable_path/../../../../Frameworks",
984984
);
985-
MACOSX_DEPLOYMENT_TARGET = 13.0;
985+
MACOSX_DEPLOYMENT_TARGET = 14.0;
986986
MARKETING_VERSION = 1.0;
987987
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
988988
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1017,7 +1017,7 @@
10171017
"@executable_path/../Frameworks",
10181018
"@executable_path/../../../../Frameworks",
10191019
);
1020-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1020+
MACOSX_DEPLOYMENT_TARGET = 14.0;
10211021
MARKETING_VERSION = 1.0;
10221022
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
10231023
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1052,7 +1052,7 @@
10521052
"@executable_path/../Frameworks",
10531053
"@executable_path/../../../../Frameworks",
10541054
);
1055-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1055+
MACOSX_DEPLOYMENT_TARGET = 14.0;
10561056
MARKETING_VERSION = 1.0;
10571057
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
10581058
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1116,7 +1116,7 @@
11161116
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
11171117
GCC_WARN_UNUSED_FUNCTION = YES;
11181118
GCC_WARN_UNUSED_VARIABLE = YES;
1119-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1119+
MACOSX_DEPLOYMENT_TARGET = 14.0;
11201120
MARKETING_VERSION = "";
11211121
MTL_ENABLE_DEBUG_INFO = NO;
11221122
MTL_FAST_MATH = YES;
@@ -1160,7 +1160,7 @@
11601160
"$(inherited)",
11611161
"@executable_path/../Frameworks",
11621162
);
1163-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1163+
MACOSX_DEPLOYMENT_TARGET = 14.0;
11641164
MARKETING_VERSION = "Change in Info.plist";
11651165
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
11661166
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1193,7 +1193,7 @@
11931193
"@executable_path/../Frameworks",
11941194
"@loader_path/../Frameworks",
11951195
);
1196-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1196+
MACOSX_DEPLOYMENT_TARGET = 14.0;
11971197
MARKETING_VERSION = 1.0;
11981198
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
11991199
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1255,7 +1255,7 @@
12551255
"@executable_path/../Frameworks",
12561256
"@executable_path/../../../../Frameworks",
12571257
);
1258-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1258+
MACOSX_DEPLOYMENT_TARGET = 14.0;
12591259
MARKETING_VERSION = 1.0;
12601260
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
12611261
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1324,7 +1324,7 @@
13241324
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13251325
GCC_WARN_UNUSED_FUNCTION = YES;
13261326
GCC_WARN_UNUSED_VARIABLE = YES;
1327-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1327+
MACOSX_DEPLOYMENT_TARGET = 14.0;
13281328
MARKETING_VERSION = "";
13291329
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
13301330
MTL_FAST_MATH = YES;
@@ -1391,7 +1391,7 @@
13911391
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
13921392
GCC_WARN_UNUSED_FUNCTION = YES;
13931393
GCC_WARN_UNUSED_VARIABLE = YES;
1394-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1394+
MACOSX_DEPLOYMENT_TARGET = 14.0;
13951395
MARKETING_VERSION = "";
13961396
MTL_ENABLE_DEBUG_INFO = NO;
13971397
MTL_FAST_MATH = YES;
@@ -1433,7 +1433,7 @@
14331433
"$(inherited)",
14341434
"@executable_path/../Frameworks",
14351435
);
1436-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1436+
MACOSX_DEPLOYMENT_TARGET = 14.0;
14371437
MARKETING_VERSION = "Change in Info.plist";
14381438
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
14391439
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1477,7 +1477,7 @@
14771477
"$(inherited)",
14781478
"@executable_path/../Frameworks",
14791479
);
1480-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1480+
MACOSX_DEPLOYMENT_TARGET = 14.0;
14811481
MARKETING_VERSION = "Change in Info.plist";
14821482
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
14831483
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1510,7 +1510,7 @@
15101510
"@executable_path/../Frameworks",
15111511
"@loader_path/../Frameworks",
15121512
);
1513-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1513+
MACOSX_DEPLOYMENT_TARGET = 14.0;
15141514
MARKETING_VERSION = 1.0;
15151515
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
15161516
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1537,7 +1537,7 @@
15371537
"@executable_path/../Frameworks",
15381538
"@loader_path/../Frameworks",
15391539
);
1540-
MACOSX_DEPLOYMENT_TARGET = 13.0;
1540+
MACOSX_DEPLOYMENT_TARGET = 14.0;
15411541
MARKETING_VERSION = 1.0;
15421542
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEditTests;
15431543
PRODUCT_NAME = "$(TARGET_NAME)";

‎CodeEdit/CodeEdit.entitlements‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
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/>
7+
<key>com.apple.security.files.user-selected.read-write</key>
8+
<true/>
9+
<key>com.apple.security.files.bookmarks.app-scope</key>
10+
<true/>
11+
<key>com.apple.security.network.client</key>
12+
<true/>
513
<key>com.apple.security.application-groups</key>
614
<array>
715
<string>app.codeedit.CodeEdit.shared</string>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ struct WorkspacePanelTabBar<Tab: WorkspacePanelTab>: View {
281281
self.tabWidth[tab] = (position == .top) ? geometry.size.width : geometry.size.height
282282
self.tabLocations[tab] = geometry.frame(in: .global)
283283
}
284-
.onChange(of: geometry.frame(in: .global)) { newFrame in
284+
.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
}

‎CodeEdit/Features/Editor/TabBar/Tabs/Tab/EditorTabButtonStyle.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ struct EditorTabButtonStyle: ButtonStyle {
1919

2020
func makeBody(configuration: Configuration) -> some View {
2121
configuration.label
22-
.onChange(of: configuration.isPressed, perform: { isPressed in
22+
.onChange(of: configuration.isPressed) { _, isPressed in
2323
self.isPressing = isPressed
24-
})
24+
}
2525
}
2626
}

‎CodeEdit/Features/Editor/TabBar/Tabs/Views/EditorTabs.swift‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,17 +223,15 @@ struct EditorTabs: View {
223223
.frame(in: .global)
224224
}
225225
.onChange(
226-
of: tabItemGeoReader.frame(in: .global),
227-
perform: { tabCGRect in
228-
tabLocations[id] = tabCGRect
229-
}
230-
)
226+
of: tabItemGeoReader.frame(in: .global)
227+
) { _, tabCGRect in
228+
tabLocations[id] = tabCGRect
229+
}
231230
.onChange(
232-
of: tabItemGeoReader.size.width,
233-
perform: { newWidth in
234-
tabWidth[id] = newWidth
235-
}
236-
)
231+
of: tabItemGeoReader.size.width
232+
) { _, newWidth in
233+
tabWidth[id] = newWidth
234+
}
237235
}
238236
}
239237

@@ -313,7 +311,7 @@ struct EditorTabs: View {
313311
// On first tab appeared, jump to the corresponding position.
314312
scrollReader.scrollTo(editor.selectedTab)
315313
}
316-
.onChange(of: editor.tabs) { [tabs = editor.tabs] newValue in
314+
.onChange(of: editor.tabs) { tabs, newValue in
317315
if tabs.count == newValue.count {
318316
updateForTabCountChange(geometryProxy: geometryProxy)
319317
} else {
@@ -331,14 +329,14 @@ struct EditorTabs: View {
331329
}
332330
}
333331
// When selected tab is changed, scroll to it if possible.
334-
.onChange(of: editor.selectedTab) { newValue in
332+
.onChange(of: editor.selectedTab) { _, newValue in
335333
withAnimation {
336334
scrollReader.scrollTo(newValue?.file.id)
337335
}
338336
}
339337

340338
// When window size changes, re-compute the expected tab width.
341-
.onChange(of: geometryProxy.size.width) { _ in
339+
.onChange(of: geometryProxy.size.width) { _, _ in
342340
withAnimation {
343341
scrollReader.scrollTo(editor.selectedTab?.file.id)
344342
}

0 commit comments

Comments
 (0)