Merge branch 'hotfix/0.23.2'

intitni · Sep 9, 2023 · cd7d1eb · cd7d1eb
2 parents af2697a + 96a3e65
commit cd7d1eb
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 26 deletions.
diff --git 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/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() {}
 

diff --git 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() {}
 

diff --git a/...HostApp/AccountSettings/CopilotView.swift → ...p/AccountSettings/GitHubCopilotView.swift b/...HostApp/AccountSettings/CopilotView.swift → ...p/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
@@ -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",

diff --git a/Pro b/Pro
diff --git 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
 
diff --git a/appcast.xml b/appcast.xml
@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+      <item>
+        <title>0.23.2</title>
+        <pubDate>Sat, 09 Sep 2023 22:07:35 +0800</pubDate>
+        <sparkle:version>241</sparkle:version>
+        <sparkle:shortVersionString>0.23.2</sparkle:shortVersionString>
+        <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+        <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.23.2
+      </sparkle:releaseNotesLink>
+        <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=="/>
+    </item>
+
     <item>
       <title>0.23.1</title>
       <pubDate>Wed, 06 Sep 2023 21:08:26 +0800</pubDate>