Skip to content

[pull] main from intitni:main #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 5 commits into from
Aug 13, 2023
Merged

[pull] main from intitni:main #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe0eee6
Fix that command w is not closing tab
intitni Aug 13, 2023
1401a6d
Fix that the project can't build without the submodule
intitni Aug 13, 2023
f6d7a86
Bump version to 0.21.1
intitni Aug 13, 2023
9be5fb6
Update appcast.xml
intitni Aug 13, 2023
c861bc3
Merge branch 'hotfix/0.21.1'
intitni Aug 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Core/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ let package = Package(
name: "PlusFeatureFlag",
dependencies: [
].pro([
"LicenseManagement"
"LicenseManagement",
])
),

Expand Down Expand Up @@ -398,10 +398,18 @@ import Foundation

func isProIncluded(file: StaticString = #file) -> Bool {
let filePath = "\(file)"
let url = URL(fileURLWithPath: filePath)
let fileURL = URL(fileURLWithPath: filePath)
let rootURL = fileURL
.deletingLastPathComponent()
.deletingLastPathComponent()
.appendingPathComponent("Pro/Package.swift")
return FileManager.default.fileExists(atPath: url.path)
let folderURL = rootURL.appendingPathComponent("Pro")
if !FileManager.default.fileExists(atPath: folderURL.path) {
return false
}
let packageManifestURL = folderURL.appendingPathComponent("Package.swift")
if !FileManager.default.fileExists(atPath: packageManifestURL.path) {
return false
}
return true
}

2 changes: 1 addition & 1 deletion Core/Sources/SuggestionWidget/ChatWindowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ struct ChatTitleBar: View {
EmptyView()
}
.opacity(0)
.keyboardShortcut("W", modifiers: [.command])
.keyboardShortcut("w", modifiers: [.command])

Spacer()
}
Expand Down
4 changes: 2 additions & 2 deletions Version.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
APP_VERSION = 0.21.0
APP_BUILD = 220
APP_VERSION = 0.21.1
APP_BUILD = 221
12 changes: 12 additions & 0 deletions appcast.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
<channel>
<title>Copilot for Xcode</title>

<item>
<title>0.21.1</title>
<pubDate>Sun, 13 Aug 2023 17:02:38 +0800</pubDate>
<sparkle:version>221</sparkle:version>
<sparkle:shortVersionString>0.21.1</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
<sparkle:releaseNotesLink>
https://github.com/intitni/CopilotForXcode/releases/tag/0.21.1
</sparkle:releaseNotesLink>
<enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.21.1/Copilot.for.Xcode.app.zip" length="31114478" type="application/octet-stream" sparkle:edSignature="5sy6qTLc/NidIemMn2jftJKPMlXNJWbqhghXDzLvk2j9zsBI6xtoG6xIWBYBtBtwoQcZZtG4cwn2VDl5c5YGBw=="/>
</item>

<item>
<title>0.21.0</title>
<pubDate>Wed, 09 Aug 2023 15:45:24 +0800</pubDate>
Expand Down