Skip to content

Commit cd7d1eb

Browse files
committed
Merge branch 'hotfix/0.23.2'
2 parents af2697a + 96a3e65 commit cd7d1eb

8 files changed

Lines changed: 36 additions & 26 deletions

File tree

Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Core/Sources/CodeiumService/CodeiumInstallationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Terminal
33

44
public struct CodeiumInstallationManager {
55
private static var isInstalling = false
6-
static let latestSupportedVersion = "1.2.57"
6+
static let latestSupportedVersion = "1.2.85"
77

88
public init() {}
99

Core/Sources/GitHubCopilotService/GitHubCopilotInstallationManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public struct GitHubCopilotInstallationManager {
1010
return URL(string: link)!
1111
}
1212

13-
static let latestSupportedVersion = "1.9.1"
13+
static let latestSupportedVersion = "1.10.2"
1414

1515
public init() {}
1616

Core/Sources/HostApp/AccountSettings/CopilotView.swift renamed to Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import SharedUIComponents
66
import SuggestionModel
77
import SwiftUI
88

9-
struct CopilotView: View {
9+
struct GitHubCopilotView: View {
1010
static var copilotAuthService: GitHubCopilotAuthServiceType?
1111

1212
class Settings: ObservableObject {
@@ -76,7 +76,7 @@ struct CopilotView: View {
7676
defer { refreshInstallationStatus() }
7777
try await installationManager.uninstall()
7878
Task { @MainActor in
79-
CopilotView.copilotAuthService = nil
79+
GitHubCopilotView.copilotAuthService = nil
8080
}
8181
}
8282
}
@@ -191,14 +191,21 @@ struct CopilotView: View {
191191
.foregroundColor(.secondary)
192192
.font(.callout)
193193
.dynamicHeightTextInFormWorkaround()
194-
}
195194

196-
Text("""
197-
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.
198-
""")
199-
.lineLimit(6)
200-
.fixedSize(horizontal: false, vertical: true)
201-
.foregroundColor(.secondary)
195+
Spacer()
196+
197+
Text("""
198+
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.
199+
""")
200+
.lineLimit(6)
201+
.dynamicHeightTextInFormWorkaround()
202+
.foregroundColor(.secondary)
203+
}
204+
.padding(8)
205+
.overlay {
206+
RoundedRectangle(cornerRadius: 8)
207+
.stroke(Color(nsColor: .separatorColor), style: .init(lineWidth: 1))
208+
}
202209

203210
VStack(alignment: .leading) {
204211
HStack {
@@ -427,8 +434,8 @@ struct ActivityIndicatorView: NSViewRepresentable {
427434
struct CopilotView_Previews: PreviewProvider {
428435
static var previews: some View {
429436
VStack(alignment: .leading, spacing: 8) {
430-
CopilotView(status: .notSignedIn, version: "1.0.0")
431-
CopilotView(status: .alreadySignedIn, isRunningAction: true)
437+
GitHubCopilotView(status: .notSignedIn, version: "1.0.0")
438+
GitHubCopilotView(status: .alreadySignedIn, isRunningAction: true)
432439
}
433440
.padding(.all, 8)
434441
}

Core/Sources/HostApp/ServiceView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct ServiceView: View {
88
var body: some View {
99
SidebarTabView(tag: $tag) {
1010
ScrollView {
11-
CopilotView().padding()
11+
GitHubCopilotView().padding()
1212
}.sidebarItem(
1313
tag: 0,
1414
title: "GitHub Copilot",

Pro

Submodule Pro updated from 39a2407 to 90d5c1c

Version.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
APP_VERSION = 0.23.1
2-
APP_BUILD = 240
1+
APP_VERSION = 0.23.2
2+
APP_BUILD = 241
33

appcast.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
<channel>
44
<title>Copilot for Xcode</title>
55

6+
<item>
7+
<title>0.23.2</title>
8+
<pubDate>Sat, 09 Sep 2023 22:07:35 +0800</pubDate>
9+
<sparkle:version>241</sparkle:version>
10+
<sparkle:shortVersionString>0.23.2</sparkle:shortVersionString>
11+
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
12+
<sparkle:releaseNotesLink>
13+
https://github.com/intitni/CopilotForXcode/releases/tag/0.23.2
14+
</sparkle:releaseNotesLink>
15+
<enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.23.2/Copilot.for.Xcode.app.zip" length="32279961" type="application/octet-stream" sparkle:edSignature="9freCwsRzTUZvOoE97lmYeghullf4xcYcPe+4Zuc1Elkh/U8vRPntxKXH49E0ebv+d+Xiw+feFE3JTRBvqzcCw=="/>
16+
</item>
17+
618
<item>
719
<title>0.23.1</title>
820
<pubDate>Wed, 06 Sep 2023 21:08:26 +0800</pubDate>

0 commit comments

Comments
 (0)