Skip to content

Commit a98f1f2

Browse files
intitniintitni
committed
Merge branch 'release/0.38.0'
2 parents be36e84 + c1c1781 commit a98f1f2

File tree

19 files changed

+469
-93
lines changed

19 files changed

+469
-93
lines changed

‎Copilot for Xcode.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@
786786
"@executable_path/../Frameworks",
787787
"@executable_path/../../../../Frameworks",
788788
);
789-
MACOSX_DEPLOYMENT_TARGET = 12.0;
789+
MACOSX_DEPLOYMENT_TARGET = 13.0;
790790
MARKETING_VERSION = "$(APP_VERSION)";
791791
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).EditorExtension";
792792
PRODUCT_NAME = Copilot;
@@ -814,7 +814,7 @@
814814
"@executable_path/../Frameworks",
815815
"@executable_path/../../../../Frameworks",
816816
);
817-
MACOSX_DEPLOYMENT_TARGET = 12.0;
817+
MACOSX_DEPLOYMENT_TARGET = 13.0;
818818
MARKETING_VERSION = "$(APP_VERSION)";
819819
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).EditorExtension";
820820
PRODUCT_NAME = Copilot;
@@ -967,7 +967,7 @@
967967
"$(inherited)",
968968
"@executable_path/../Frameworks",
969969
);
970-
MACOSX_DEPLOYMENT_TARGET = 12.0;
970+
MACOSX_DEPLOYMENT_TARGET = 13.0;
971971
MARKETING_VERSION = "$(APP_VERSION)";
972972
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
973973
PRODUCT_MODULE_NAME = Copilot_for_Xcode;
@@ -1001,7 +1001,7 @@
10011001
"$(inherited)",
10021002
"@executable_path/../Frameworks",
10031003
);
1004-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1004+
MACOSX_DEPLOYMENT_TARGET = 13.0;
10051005
MARKETING_VERSION = "$(APP_VERSION)";
10061006
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
10071007
PRODUCT_NAME = "$(HOST_APP_NAME)";
@@ -1017,7 +1017,7 @@
10171017
DEAD_CODE_STRIPPING = YES;
10181018
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10191019
ENABLE_HARDENED_RUNTIME = YES;
1020-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1020+
MACOSX_DEPLOYMENT_TARGET = 13.0;
10211021
PRODUCT_NAME = "$(TARGET_NAME)";
10221022
SKIP_INSTALL = YES;
10231023
SWIFT_VERSION = 5.0;
@@ -1031,7 +1031,7 @@
10311031
DEAD_CODE_STRIPPING = YES;
10321032
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
10331033
ENABLE_HARDENED_RUNTIME = YES;
1034-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1034+
MACOSX_DEPLOYMENT_TARGET = 13.0;
10351035
PRODUCT_NAME = "$(TARGET_NAME)";
10361036
SKIP_INSTALL = YES;
10371037
SWIFT_VERSION = 5.0;
@@ -1061,7 +1061,7 @@
10611061
"$(inherited)",
10621062
"@executable_path/../Frameworks",
10631063
);
1064-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1064+
MACOSX_DEPLOYMENT_TARGET = 13.0;
10651065
MARKETING_VERSION = "$(APP_VERSION)";
10661066
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
10671067
PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
@@ -1094,7 +1094,7 @@
10941094
"$(inherited)",
10951095
"@executable_path/../Frameworks",
10961096
);
1097-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1097+
MACOSX_DEPLOYMENT_TARGET = 13.0;
10981098
MARKETING_VERSION = "$(APP_VERSION)";
10991099
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
11001100
PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
@@ -1114,7 +1114,7 @@
11141114
ENABLE_USER_SCRIPT_SANDBOXING = YES;
11151115
GCC_C_LANGUAGE_STANDARD = gnu17;
11161116
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1117-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1117+
MACOSX_DEPLOYMENT_TARGET = 13.0;
11181118
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).CommunicationBridge";
11191119
PRODUCT_NAME = "$(TARGET_NAME)";
11201120
SKIP_INSTALL = YES;
@@ -1133,7 +1133,7 @@
11331133
ENABLE_USER_SCRIPT_SANDBOXING = YES;
11341134
GCC_C_LANGUAGE_STANDARD = gnu17;
11351135
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1136-
MACOSX_DEPLOYMENT_TARGET = 12.0;
1136+
MACOSX_DEPLOYMENT_TARGET = 13.0;
11371137
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).CommunicationBridge";
11381138
PRODUCT_NAME = "$(TARGET_NAME)";
11391139
SKIP_INSTALL = YES;

‎Core/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import PackageDescription
88

99
let package = Package(
1010
name: "Core",
11-
platforms: [.macOS(.v12)],
11+
platforms: [.macOS(.v13)],
1212
products: [
1313
.library(
1414
name: "Service",

‎Core/Sources/SuggestionWidget/WidgetWindowsController.swift‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ public final class WidgetWindows {
704704
defer: false
705705
)
706706
it.isReleasedWhenClosed = false
707-
it.isOpaque = true
708707
it.backgroundColor = .clear
709708
it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
710709
it.hasShadow = false
@@ -722,7 +721,6 @@ public final class WidgetWindows {
722721
defer: false
723722
)
724723
it.isReleasedWhenClosed = false
725-
it.isOpaque = true
726724
it.backgroundColor = .clear
727725
it.level = widgetLevel(0)
728726
it.hasShadow = false
@@ -748,7 +746,6 @@ public final class WidgetWindows {
748746
defer: false
749747
)
750748
it.isReleasedWhenClosed = false
751-
it.isOpaque = true
752749
it.backgroundColor = .clear
753750
it.level = widgetLevel(2)
754751
it.hoveringLevel = widgetLevel(2)
@@ -782,7 +779,6 @@ public final class WidgetWindows {
782779
defer: false
783780
)
784781
it.isReleasedWhenClosed = false
785-
it.isOpaque = true
786782
it.backgroundColor = .clear
787783
it.level = widgetLevel(2)
788784
it.hasShadow = false

‎OverlayWindow/Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55

66
let package = Package(
77
name: "OverlayWindow",
8-
platforms: [.macOS(.v12)],
8+
platforms: [.macOS(.v13)],
99
products: [
1010
.library(
1111
name: "OverlayWindow",
@@ -25,15 +25,15 @@ let package = Package(
2525
.product(name: "Toast", package: "Tool"),
2626
.product(name: "Preferences", package: "Tool"),
2727
.product(name: "Logger", package: "Tool"),
28+
.product(name: "DebounceFunction", package: "Tool"),
2829
.product(name: "Perception", package: "swift-perception"),
2930
.product(name: "Dependencies", package: "swift-dependencies"),
3031
]
3132
),
3233
.testTarget(
3334
name: "OverlayWindowTests",
34-
dependencies: ["OverlayWindow"]
35+
dependencies: ["OverlayWindow", .product(name: "DebounceFunction", package: "Tool")]
3536
),
3637
]
3738
)
3839

39-

‎OverlayWindow/Tests/OverlayWindowTests/WindowTests.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import Testing
2-
@testable import Window
32

43
@Test func example() async throws {
54
// Write your test here and use APIs like `#expect(...)` to check expected conditions.

‎Tool/Sources/AXExtension/AXUIElement.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public extension AXUIElement {
345345
) {
346346
#if DEBUG
347347
var count = 0
348-
let startDate = Date()
348+
// let startDate = Date()
349349
#endif
350350
func _traverse(
351351
element: AXUIElement,
@@ -380,14 +380,14 @@ public extension AXUIElement {
380380
_ = _traverse(element: self, level: 0, info: info, handle: handle)
381381

382382
#if DEBUG
383-
let duration = Date().timeIntervalSince(startDate)
384-
.formatted(.number.precision(.fractionLength(0...4)))
385-
Logger.service.debug(
386-
"AXUIElement.traverse count: \(count), took \(duration) seconds",
387-
file: file,
388-
line: line,
389-
function: function
390-
)
383+
// let duration = Date().timeIntervalSince(startDate)
384+
// .formatted(.number.precision(.fractionLength(0...4)))
385+
// Logger.service.debug(
386+
// "AXUIElement.traverse count: \(count), took \(duration) seconds",
387+
// file: file,
388+
// line: line,
389+
// function: function
390+
// )
391391
#endif
392392
}
393393

‎Tool/Sources/ChatBasic/ChatAgent.swift‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,20 @@ public struct ChatAgentRequest {
3333
public var history: [ChatMessage]
3434
public var references: [ChatMessage.Reference]
3535
public var topics: [ChatMessage.Reference]
36+
public var agentInstructions: String? = nil
3637

3738
public init(
3839
text: String,
3940
history: [ChatMessage],
4041
references: [ChatMessage.Reference],
41-
topics: [ChatMessage.Reference]
42+
topics: [ChatMessage.Reference],
43+
agentInstructions: String? = nil
4244
) {
4345
self.text = text
4446
self.history = history
4547
self.references = references
4648
self.topics = topics
49+
self.agentInstructions = agentInstructions
4750
}
4851
}
4952

‎Tool/Sources/ChatBasic/ChatGPTFunction.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public enum ChatGPTFunctionResultUserReadableContent: Sendable {
2727

2828
case text(String)
2929
case list([ListItem])
30+
case searchResult([ListItem], queries: [String])
3031
}
3132

3233
public protocol ChatGPTFunctionResult {

‎Tool/Sources/Logger/Logger.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ public final class Logger {
5353
osLogType = .error
5454
}
5555

56+
#if DEBUG
57+
os_log("%{public}@", log: osLog, type: osLogType, "\(file):\(line) \(function)\n\n\(message)" as CVarArg)
58+
#else
5659
os_log("%{public}@", log: osLog, type: osLogType, message as CVarArg)
60+
#endif
5761
}
5862

5963
public func debug(

0 commit comments

Comments
 (0)