From e9e7f0e1da507068e5dcb2885fa6d554182aa5e8 Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 21:18:53 +0800 Subject: [PATCH 1/6] Update --- Pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pro b/Pro index 39a2407c..90d5c1c3 160000 --- a/Pro +++ b/Pro @@ -1 +1 @@ -Subproject commit 39a2407c29febaf5a74095177dc1035f5551dd69 +Subproject commit 90d5c1c304b671241a6fb3deaec99c2997fcb943 From e4a41c41c83eb9e75df016fb6cb745515fbe46d9 Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 21:27:12 +0800 Subject: [PATCH 2/6] Bump Codeium version to 1.2.85 --- Core/Sources/CodeiumService/CodeiumInstallationManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Sources/CodeiumService/CodeiumInstallationManager.swift b/Core/Sources/CodeiumService/CodeiumInstallationManager.swift index 1101538e..4ade251d 100644 --- a/Core/Sources/CodeiumService/CodeiumInstallationManager.swift +++ b/Core/Sources/CodeiumService/CodeiumInstallationManager.swift @@ -3,7 +3,7 @@ import Terminal public struct CodeiumInstallationManager { private static var isInstalling = false - static let latestSupportedVersion = "1.2.57" + static let latestSupportedVersion = "1.2.85" public init() {} From 009ea14ff713db37249a4a43da2266f03f277ec7 Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 21:27:33 +0800 Subject: [PATCH 3/6] Bump GitHub Copilot version to 1.10.2 --- .../GitHubCopilotService/GitHubCopilotInstallationManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift b/Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift index 65b7e89b..79d98d19 100644 --- a/Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift +++ b/Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift @@ -10,7 +10,7 @@ public struct GitHubCopilotInstallationManager { return URL(string: link)! } - static let latestSupportedVersion = "1.9.1" + static let latestSupportedVersion = "1.10.2" public init() {} From d9cad3daf911fe81ff659397e4f5b2fd3d30f7a4 Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 21:38:26 +0800 Subject: [PATCH 4/6] Adjust UI --- ...ilotView.swift => GitHubCopilotView.swift} | 29 ++++++++++++------- Core/Sources/HostApp/ServiceView.swift | 2 +- 2 files changed, 19 insertions(+), 12 deletions(-) rename Core/Sources/HostApp/AccountSettings/{CopilotView.swift => GitHubCopilotView.swift} (94%) diff --git a/Core/Sources/HostApp/AccountSettings/CopilotView.swift b/Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift similarity index 94% rename from Core/Sources/HostApp/AccountSettings/CopilotView.swift rename to Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift index eec77dff..d31b1fb8 100644 --- a/Core/Sources/HostApp/AccountSettings/CopilotView.swift +++ b/Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift @@ -6,7 +6,7 @@ import SharedUIComponents import SuggestionModel import SwiftUI -struct CopilotView: View { +struct GitHubCopilotView: View { static var copilotAuthService: GitHubCopilotAuthServiceType? class Settings: ObservableObject { @@ -76,7 +76,7 @@ struct CopilotView: View { defer { refreshInstallationStatus() } try await installationManager.uninstall() Task { @MainActor in - CopilotView.copilotAuthService = nil + GitHubCopilotView.copilotAuthService = nil } } } @@ -191,14 +191,21 @@ struct CopilotView: View { .foregroundColor(.secondary) .font(.callout) .dynamicHeightTextInFormWorkaround() - } - Text(""" - You may have to restart the helper app to apply the changes. To do so, simply close the helper app by clicking on the menu bar icon that looks like a tentacle, it will automatically restart as needed. - """) - .lineLimit(6) - .fixedSize(horizontal: false, vertical: true) - .foregroundColor(.secondary) + Spacer() + + Text(""" + You may have to restart the helper app to apply the changes. To do so, simply close the helper app by clicking on the menu bar icon that looks like a tentacle, it will automatically restart as needed. + """) + .lineLimit(6) + .dynamicHeightTextInFormWorkaround() + .foregroundColor(.secondary) + } + .padding(8) + .overlay { + RoundedRectangle(cornerRadius: 8) + .stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1)) + } VStack(alignment: .leading) { HStack { @@ -427,8 +434,8 @@ struct ActivityIndicatorView: NSViewRepresentable { struct CopilotView_Previews: PreviewProvider { static var previews: some View { VStack(alignment: .leading, spacing: 8) { - CopilotView(status: .notSignedIn, version: "1.0.0") - CopilotView(status: .alreadySignedIn, isRunningAction: true) + GitHubCopilotView(status: .notSignedIn, version: "1.0.0") + GitHubCopilotView(status: .alreadySignedIn, isRunningAction: true) } .padding(.all, 8) } diff --git a/Core/Sources/HostApp/ServiceView.swift b/Core/Sources/HostApp/ServiceView.swift index ef259ee6..b0e6bf59 100644 --- a/Core/Sources/HostApp/ServiceView.swift +++ b/Core/Sources/HostApp/ServiceView.swift @@ -8,7 +8,7 @@ struct ServiceView: View { var body: some View { SidebarTabView(tag: $tag) { ScrollView { - CopilotView().padding() + GitHubCopilotView().padding() }.sidebarItem( tag: 0, title: "GitHub Copilot", From 37aee9420d39a56ca6531c8e596b9bd121a2b7c0 Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 21:38:36 +0800 Subject: [PATCH 5/6] Bump version to 0.23.2 --- .../xcshareddata/swiftpm/Package.resolved | 9 --------- Version.xcconfig | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved index 99ca18ea..ea699cb1 100644 --- a/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,5 @@ { "pins" : [ - { - "identity" : "cgeventoverride", - "kind" : "remoteSourceControl", - "location" : "https://github.com/intitni/CGEventOverride", - "state" : { - "revision" : "40b29e804204c461253a52b77adea9c055184aad", - "version" : "1.2.0" - } - }, { "identity" : "codablewrappers", "kind" : "remoteSourceControl", diff --git a/Version.xcconfig b/Version.xcconfig index 987c2122..9b74baa7 100644 --- a/Version.xcconfig +++ b/Version.xcconfig @@ -1,3 +1,3 @@ -APP_VERSION = 0.23.1 -APP_BUILD = 240 +APP_VERSION = 0.23.2 +APP_BUILD = 241 From 96a3e654287fe9a2f84b3aa783d06814f03d8fce Mon Sep 17 00:00:00 2001 From: Shx Guo Date: Sat, 9 Sep 2023 22:14:44 +0800 Subject: [PATCH 6/6] Update appcast.xml --- appcast.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/appcast.xml b/appcast.xml index ca5e80bf..b8e4aa63 100644 --- a/appcast.xml +++ b/appcast.xml @@ -3,6 +3,18 @@ Copilot for Xcode + + 0.23.2 + Sat, 09 Sep 2023 22:07:35 +0800 + 241 + 0.23.2 + 12.0 + + https://github.com/intitni/CopilotForXcode/releases/tag/0.23.2 + + + + 0.23.1 Wed, 06 Sep 2023 21:08:26 +0800