Skip to content

Commit 7a57fe0

Browse files
intitniintitni
committed
Merge branch 'release/0.33.5'
2 parents 72c41a1 + de2bb8a commit 7a57fe0

6 files changed

Lines changed: 21 additions & 30 deletions

File tree

‎Core/Package.swift‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ let package = Package(
366366
extension [Target.Dependency] {
367367
func pro(_ targetNames: [String]) -> [Target.Dependency] {
368368
if isProIncluded {
369-
// include the pro package
370369
return self + targetNames.map { Target.Dependency.product(name: $0, package: "Pro") }
371370
}
372371
return self
@@ -376,27 +375,22 @@ extension [Target.Dependency] {
376375
extension [Package.Dependency] {
377376
var pro: [Package.Dependency] {
378377
if isProIncluded {
379-
// include the pro package
380-
return self + [.package(path: "../../CopilotForXcodePro/Pro")]
378+
return self + [.package(path: "../../Pro")]
381379
}
382380
return self
383381
}
384382
}
385383

386-
let isProIncluded: Bool = {
384+
var isProIncluded: Bool {
387385
func isProIncluded(file: StaticString = #file) -> Bool {
388386
let filePath = "\(file)"
389387
let fileURL = URL(fileURLWithPath: filePath)
390388
let rootURL = fileURL
391389
.deletingLastPathComponent()
392390
.deletingLastPathComponent()
393-
.deletingLastPathComponent()
394391
let confURL = rootURL.appendingPathComponent("PLUS")
395-
if !FileManager.default.fileExists(atPath: confURL.path) {
396-
return false
397-
}
398-
return true
392+
return FileManager.default.fileExists(atPath: confURL.path)
399393
}
400394

401395
return isProIncluded()
402-
}()
396+
}

‎Tool/Sources/CodeiumService/CodeiumExtension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public final class CodeiumExtension: BuiltinExtension {
1616

1717
public var suggestionServiceId: Preferences.BuiltInSuggestionFeatureProvider { .codeium }
1818

19-
public let suggestionService: CodeiumSuggestionService?
19+
public let suggestionService: CodeiumSuggestionService
2020

2121
public var chatTabTypes: [any ChatTab.Type] {
2222
[CodeiumChatTab.self]

‎Tool/Sources/OpenAIService/APIs/ClaudeChatCompletionsService.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ import Preferences
88
/// https://docs.anthropic.com/claude/reference/messages_post
99
public actor ClaudeChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI {
1010
public enum KnownModel: String, CaseIterable {
11+
case claude35Sonnet = "claude-3-5-sonnet-20240620"
1112
case claude3Opus = "claude-3-opus-20240229"
1213
case claude3Sonnet = "claude-3-sonnet-20240229"
1314
case claude3Haiku = "claude-3-haiku-20240307"
1415

1516
public var contextWindow: Int {
1617
switch self {
18+
case .claude35Sonnet: return 200_000
1719
case .claude3Opus: return 200_000
1820
case .claude3Sonnet: return 200_000
1921
case .claude3Haiku: return 200_000

‎Tool/Sources/Preferences/Types/GoogleGenerativeChatModel.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Foundation
22

33
public enum GoogleGenerativeAIModel: String {
4+
case gemini15Pro = "gemini-1.5-pro"
5+
case gemini15Flash = "gemini-1.5-flash"
46
case geminiPro = "gemini-pro"
57
}
68

@@ -9,6 +11,10 @@ public extension GoogleGenerativeAIModel {
911
switch self {
1012
case .geminiPro:
1113
return 32768
14+
case .gemini15Flash:
15+
return 1_048_576
16+
case .gemini15Pro:
17+
return 2_097_152
1218
}
1319
}
1420
}

‎Version.xcconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
APP_VERSION = 0.33.5
2-
APP_BUILD = 393
2+
APP_BUILD = 394
33

‎appcast.xml‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@
44
<title>Copilot for Xcode</title>
55
<item>
66
<title>0.33.5</title>
7-
<pubDate>Tue, 02 Jul 2024 23:07:42 +0800</pubDate>
8-
<sparkle:channel>beta</sparkle:channel>
9-
<sparkle:version>393</sparkle:version>
7+
<pubDate>Mon, 08 Jul 2024 23:53:53 +0800</pubDate>
8+
<sparkle:version>394</sparkle:version>
109
<sparkle:shortVersionString>0.33.5</sparkle:shortVersionString>
1110
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
12-
<sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.5.beta</sparkle:releaseNotesLink>
13-
<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=="/>
11+
<sparkle:releaseNotesLink>https://copilotforxcode.intii.com/changelog/0.33.5</sparkle:releaseNotesLink>
12+
<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=="/>
1413
</item>
1514
<item>
1615
<title>0.33.5</title>
17-
<pubDate>Mon, 01 Jul 2024 01:11:30 +0800</pubDate>
18-
<sparkle:version>392</sparkle:version>
16+
<pubDate>Tue, 02 Jul 2024 23:07:42 +0800</pubDate>
1917
<sparkle:channel>beta</sparkle:channel>
18+
<sparkle:version>393</sparkle:version>
2019
<sparkle:shortVersionString>0.33.5</sparkle:shortVersionString>
2120
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
2221
<sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.5.beta</sparkle:releaseNotesLink>
23-
<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=="/>
22+
<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=="/>
2423
</item>
2524
<item>
2625
<title>0.33.4</title>
@@ -40,15 +39,5 @@
4039
<sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.3</sparkle:releaseNotesLink>
4140
<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=="/>
4241
</item>
43-
<item>
44-
<title>0.33.1</title>
45-
<pubDate>Sat, 25 May 2024 03:24:57 +0800</pubDate>
46-
<sparkle:releaseNotesLink>https://github.com/intitni/CopilotForXcode/releases/tag/0.33.1.beta</sparkle:releaseNotesLink>
47-
<sparkle:channel>beta</sparkle:channel>
48-
<sparkle:version>380</sparkle:version>
49-
<sparkle:shortVersionString>0.33.1</sparkle:shortVersionString>
50-
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
51-
<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=="/>
52-
</item>
5342
</channel>
5443
</rss>

0 commit comments

Comments
 (0)