Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Copilot for Xcode.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).EditorExtension";
PRODUCT_NAME = Copilot;
Expand Down Expand Up @@ -814,7 +814,7 @@
"@executable_path/../Frameworks",
"@executable_path/../../../../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).EditorExtension";
PRODUCT_NAME = Copilot;
Expand Down Expand Up @@ -967,7 +967,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
PRODUCT_MODULE_NAME = Copilot_for_Xcode;
Expand Down Expand Up @@ -1001,7 +1001,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE)";
PRODUCT_NAME = "$(HOST_APP_NAME)";
Expand All @@ -1017,7 +1017,7 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
Expand All @@ -1031,7 +1031,7 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 5YKZ4Y3DAW;
ENABLE_HARDENED_RUNTIME = YES;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1061,7 +1061,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
Expand Down Expand Up @@ -1094,7 +1094,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = "$(APP_VERSION)";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).ExtensionService";
PRODUCT_NAME = "$(EXTENSION_SERVICE_NAME)";
Expand All @@ -1114,7 +1114,7 @@
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).CommunicationBridge";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -1133,7 +1133,7 @@
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = 13.0;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER_BASE).CommunicationBridge";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
2 changes: 1 addition & 1 deletion Core/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import PackageDescription

let package = Package(
name: "Core",
platforms: [.macOS(.v12)],
platforms: [.macOS(.v13)],
products: [
.library(
name: "Service",
Expand Down
4 changes: 0 additions & 4 deletions Core/Sources/SuggestionWidget/WidgetWindowsController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@ public final class WidgetWindows {
defer: false
)
it.isReleasedWhenClosed = false
it.isOpaque = true
it.backgroundColor = .clear
it.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
it.hasShadow = false
Expand All @@ -722,7 +721,6 @@ public final class WidgetWindows {
defer: false
)
it.isReleasedWhenClosed = false
it.isOpaque = true
it.backgroundColor = .clear
it.level = widgetLevel(0)
it.hasShadow = false
Expand All @@ -748,7 +746,6 @@ public final class WidgetWindows {
defer: false
)
it.isReleasedWhenClosed = false
it.isOpaque = true
it.backgroundColor = .clear
it.level = widgetLevel(2)
it.hoveringLevel = widgetLevel(2)
Expand Down Expand Up @@ -782,7 +779,6 @@ public final class WidgetWindows {
defer: false
)
it.isReleasedWhenClosed = false
it.isOpaque = true
it.backgroundColor = .clear
it.level = widgetLevel(2)
it.hasShadow = false
Expand Down
6 changes: 3 additions & 3 deletions OverlayWindow/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription

let package = Package(
name: "OverlayWindow",
platforms: [.macOS(.v12)],
platforms: [.macOS(.v13)],
products: [
.library(
name: "OverlayWindow",
Expand All @@ -25,15 +25,15 @@ let package = Package(
.product(name: "Toast", package: "Tool"),
.product(name: "Preferences", package: "Tool"),
.product(name: "Logger", package: "Tool"),
.product(name: "DebounceFunction", package: "Tool"),
.product(name: "Perception", package: "swift-perception"),
.product(name: "Dependencies", package: "swift-dependencies"),
]
),
.testTarget(
name: "OverlayWindowTests",
dependencies: ["OverlayWindow"]
dependencies: ["OverlayWindow", .product(name: "DebounceFunction", package: "Tool")]
),
]
)


1 change: 0 additions & 1 deletion OverlayWindow/Tests/OverlayWindowTests/WindowTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Testing
@testable import Window

@Test func example() async throws {
// Write your test here and use APIs like `#expect(...)` to check expected conditions.
Expand Down
18 changes: 9 additions & 9 deletions Tool/Sources/AXExtension/AXUIElement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public extension AXUIElement {
) {
#if DEBUG
var count = 0
let startDate = Date()
// let startDate = Date()
#endif
func _traverse(
element: AXUIElement,
Expand Down Expand Up @@ -380,14 +380,14 @@ public extension AXUIElement {
_ = _traverse(element: self, level: 0, info: info, handle: handle)

#if DEBUG
let duration = Date().timeIntervalSince(startDate)
.formatted(.number.precision(.fractionLength(0...4)))
Logger.service.debug(
"AXUIElement.traverse count: \(count), took \(duration) seconds",
file: file,
line: line,
function: function
)
// let duration = Date().timeIntervalSince(startDate)
// .formatted(.number.precision(.fractionLength(0...4)))
// Logger.service.debug(
// "AXUIElement.traverse count: \(count), took \(duration) seconds",
// file: file,
// line: line,
// function: function
// )
#endif
}

Expand Down
5 changes: 4 additions & 1 deletion Tool/Sources/ChatBasic/ChatAgent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@ public struct ChatAgentRequest {
public var history: [ChatMessage]
public var references: [ChatMessage.Reference]
public var topics: [ChatMessage.Reference]
public var agentInstructions: String? = nil

public init(
text: String,
history: [ChatMessage],
references: [ChatMessage.Reference],
topics: [ChatMessage.Reference]
topics: [ChatMessage.Reference],
agentInstructions: String? = nil
) {
self.text = text
self.history = history
self.references = references
self.topics = topics
self.agentInstructions = agentInstructions
}
}

Expand Down
1 change: 1 addition & 0 deletions Tool/Sources/ChatBasic/ChatGPTFunction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public enum ChatGPTFunctionResultUserReadableContent: Sendable {

case text(String)
case list([ListItem])
case searchResult([ListItem], queries: [String])
}

public protocol ChatGPTFunctionResult {
Expand Down
4 changes: 4 additions & 0 deletions Tool/Sources/Logger/Logger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ public final class Logger {
osLogType = .error
}

#if DEBUG
os_log("%{public}@", log: osLog, type: osLogType, "\(file):\(line) \(function)\n\n\(message)" as CVarArg)
#else
os_log("%{public}@", log: osLog, type: osLogType, message as CVarArg)
#endif
}

public func debug(
Expand Down
Loading