Merge branch 'release/0.33.5'

Author: intitni

Core/Package.swift

@@ -366,7 +366,6 @@ let package = Package(
 extension [Target.Dependency] {
     func pro(_ targetNames: [String]) -> [Target.Dependency] {
         if isProIncluded {
-            // include the pro package
             return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
         }
         return self
@@ -376,27 +375,22 @@ extension [Target.Dependency] {
 extension [Package.Dependency] {
     var pro: [Package.Dependency] {
         if isProIncluded {
-            // include the pro package
-            return self + [.package(path: "../../CopilotForXcodePro/Pro")]
+            return self + [.package(path: "../../Pro")]
         }
         return self
     }
 }
 
-let isProIncluded: Bool = {
+var isProIncluded: Bool {
     func isProIncluded(file: StaticString = #file) -> Bool {
         let filePath = "\(file)"
         let fileURL = URL(fileURLWithPath: filePath)
         let rootURL = fileURL
             .deletingLastPathComponent()
             .deletingLastPathComponent()
-            .deletingLastPathComponent()
         let confURL = rootURL.appendingPathComponent("PLUS")
-        if !FileManager.default.fileExists(atPath: confURL.path) {
-            return false
-        }
-        return true
+        return FileManager.default.fileExists(atPath: confURL.path)
     }
 
     return isProIncluded()
-}()
+}

Tool/Sources/CodeiumService/CodeiumExtension.swift

@@ -16,7 +16,7 @@ public final class CodeiumExtension: BuiltinExtension {
 
     public var suggestionServiceId: Preferences.BuiltInSuggestionFeatureProvider { .codeium }
 
-    public let suggestionService: CodeiumSuggestionService?
+    public let suggestionService: CodeiumSuggestionService
 
     public var chatTabTypes: [any ChatTab.Type] {
         [CodeiumChatTab.self]

Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift

@@ -8,12 +8,14 @@ import Preferences
 /// https://docs.anthropic.com/claude/reference/messages_post
 public actor ClaudeChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI {
     public enum KnownModel: String, CaseIterable {
+        case claude35Sonnet = "claude-3-5-sonnet-20240620"
         case claude3Opus = "claude-3-opus-20240229"
         case claude3Sonnet = "claude-3-sonnet-20240229"
         case claude3Haiku = "claude-3-haiku-20240307"
 
         public var contextWindow: Int {
             switch self {
+            case .claude35Sonnet: return 200_000
             case .claude3Opus: return 200_000
             case .claude3Sonnet: return 200_000
             case .claude3Haiku: return 200_000

Tool/Sources/Preferences/Types/GoogleGenerativeChatModel.swift

@@ -1,6 +1,8 @@
 import Foundation
 
 public enum GoogleGenerativeAIModel: String {
+    case gemini15Pro = "gemini-1.5-pro"
+    case gemini15Flash = "gemini-1.5-flash"
     case geminiPro = "gemini-pro"
 }
 
@@ -9,6 +11,10 @@ public extension GoogleGenerativeAIModel {
         switch self {
         case .geminiPro:
             return 32768
+        case .gemini15Flash:
+            return 1_048_576
+        case .gemini15Pro:
+            return 2_097_152
         }
     }
 }

Version.xcconfig

@@ -1,3 +1,3 @@
 APP_VERSION = 0.33.5
-APP_BUILD = 393
+APP_BUILD = 394
 

appcast.xml

@@ -4,23 +4,22 @@
         <title>Copilot for Xcode</title>
         <item>
             <title>0.33.5</title>
-            <pubDate>Tue, 02 Jul 2024 23:07:42 +0800</pubDate>
-            <sparkle:channel>beta</sparkle:channel>
-            <sparkle:version>393</sparkle:version>
+            <pubDate>Mon, 08 Jul 2024 23:53:53 +0800</pubDate>
+            <sparkle:version>394</sparkle:version>
             <sparkle:shortVersionString>0.33.5</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
-            <sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.5.beta</sparkle:releaseNotesLink>
-            <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.5.beta/Copilot.for.Xcode.app.beta.2.zip" length="50054458" type="application/octet-stream" sparkle:edSignature="9APrYWxnRrYCFk1om0Xwsl5S3Z+BbpFIgE1Rliwer5Fiq1cgsJpJg79siHGTWNuA6gxmMC6VF7LSjhDE9czbBw=="/>
+            <sparkle:releaseNotesLink>https://copilotforxcode.intii.com/changelog/0.33.5</sparkle:releaseNotesLink>
+            <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.5/Copilot.for.Xcode.app.zip" length="44354117" type="application/octet-stream" sparkle:edSignature="B+FyeLaH8Wia/trt8sCOxbAsnGRQpJIViLapI/pnimL6hyElPRKYd+aW2tVB5Kb9X4vXpsaUyC0kM9sP+RgwCQ=="/>
         </item>
         <item>
             <title>0.33.5</title>
-            <pubDate>Mon, 01 Jul 2024 01:11:30 +0800</pubDate>
-            <sparkle:version>392</sparkle:version>
+            <pubDate>Tue, 02 Jul 2024 23:07:42 +0800</pubDate>
             <sparkle:channel>beta</sparkle:channel>
+            <sparkle:version>393</sparkle:version>
             <sparkle:shortVersionString>0.33.5</sparkle:shortVersionString>
             <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
             <sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.5.beta</sparkle:releaseNotesLink>
-            <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.5.beta/Copilot.for.Xcode.app.zip" length="50043361" type="application/octet-stream" sparkle:edSignature="VYELCaaewNHUBJ9dZZed1aFyLnIKo8aIwKjcxZvauC3/oMXae8AJWGH//SxyNqcu6+dpojROretKiL9vltf6CA=="/>
+            <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.5.beta/Copilot.for.Xcode.app.beta.2.zip" length="50054458" type="application/octet-stream" sparkle:edSignature="9APrYWxnRrYCFk1om0Xwsl5S3Z+BbpFIgE1Rliwer5Fiq1cgsJpJg79siHGTWNuA6gxmMC6VF7LSjhDE9czbBw=="/>
         </item>
         <item>
             <title>0.33.4</title>
@@ -40,15 +39,5 @@
             <sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.3</sparkle:releaseNotesLink>
             <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.3/Copilot.for.Xcode.app.zip" length="50147650" type="application/octet-stream" sparkle:edSignature="bYFnu939VtqEAhkQ+3IxKUaapG8dmDcZWWJNjV6de4dJ/z1u1WUm/9gXVTX3MpqXxOxxGz0cYXjPtUVlq6MkDA=="/>
         </item>
-        <item>
-            <title>0.33.1</title>
-            <pubDate>Sat, 25 May 2024 03:24:57 +0800</pubDate>
-            <sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.1.beta</sparkle:releaseNotesLink>
-            <sparkle:channel>beta</sparkle:channel>
-            <sparkle:version>380</sparkle:version>
-            <sparkle:shortVersionString>0.33.1</sparkle:shortVersionString>
-            <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
-            <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.33.1.beta/Copilot.for.Xcode.app.beta.2.zip" length="50235347" type="application/octet-stream" sparkle:edSignature="rYSFf8oumdSQSDLZCse0oKrD8fb7VbqwCtn2hMcMWh1zFZk4PFfwngyvZCMDUJJyYPGbYAOWvvAzmOw9mrHiDg=="/>
-        </item>
     </channel>
 </rss>