Skip to content

Commit 02e7f90

Browse files
committed
refactor: replace space with hyphen in directory names
1 parent 93e7a8f commit 02e7f90

File tree

96 files changed

+38
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+38
-36
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ release/
304304
.fl5C1A396C
305305

306306
# Embedded mutagen resources
307-
Coder Desktop/Resources/mutagen-*
307+
Coder-Desktop/Resources/mutagen-*

CONTRIBUTING.md

+2-2
File renamed without changes.
File renamed without changes.

Coder Desktop/Coder Desktop.xctestplan Coder-Desktop/Coder-Desktop.xctestplan

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
],
1111
"defaultOptions" : {
1212
"targetForVariableExpansion" : {
13-
"containerPath" : "container:Coder Desktop.xcodeproj",
13+
"containerPath" : "container:Coder-Desktop.xcodeproj",
1414
"identifier" : "961678FB2CFF100D00B2B6DF",
1515
"name" : "Coder Desktop"
1616
}
1717
},
1818
"testTargets" : [
1919
{
2020
"target" : {
21-
"containerPath" : "container:Coder Desktop.xcodeproj",
21+
"containerPath" : "container:Coder-Desktop.xcodeproj",
2222
"identifier" : "AA3B40972D2FC8560099996A",
2323
"name" : "CoderSDKTests"
2424
}
@@ -27,21 +27,21 @@
2727
"enabled" : false,
2828
"parallelizable" : true,
2929
"target" : {
30-
"containerPath" : "container:Coder Desktop.xcodeproj",
30+
"containerPath" : "container:Coder-Desktop.xcodeproj",
3131
"identifier" : "961679182CFF100E00B2B6DF",
3232
"name" : "Coder DesktopUITests"
3333
}
3434
},
3535
{
3636
"target" : {
37-
"containerPath" : "container:Coder Desktop.xcodeproj",
37+
"containerPath" : "container:Coder-Desktop.xcodeproj",
3838
"identifier" : "AA3B3DA72D2D23860099996A",
3939
"name" : "VPNLibTests"
4040
}
4141
},
4242
{
4343
"target" : {
44-
"containerPath" : "container:Coder Desktop.xcodeproj",
44+
"containerPath" : "container:Coder-Desktop.xcodeproj",
4545
"identifier" : "9616790E2CFF100E00B2B6DF",
4646
"name" : "Coder DesktopTests"
4747
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Coder Desktop/VPNLib/FileSync/daemon.grpc.swift Coder-Desktop/VPNLib/FileSync/daemon.grpc.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swift-format-ignore-file
44
//
55
// Generated by the protocol buffer compiler.
6-
// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
6+
// Source: Coder-Desktop/VPNLib/FileSync/daemon.proto
77
//
88
import GRPC
99
import NIO

Coder Desktop/VPNLib/FileSync/daemon.pb.swift Coder-Desktop/VPNLib/FileSync/daemon.pb.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
6+
// Source: Coder-Desktop/VPNLib/FileSync/daemon.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Coder Desktop/VPNLib/vpn.pb.swift Coder-Desktop/VPNLib/vpn.pb.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// swiftlint:disable all
44
//
55
// Generated by the Swift generator plugin for the protocol buffer compiler.
6-
// Source: Coder Desktop/VPNLib/vpn.proto
6+
// Source: Coder-Desktop/VPNLib/vpn.proto
77
//
88
// For information on using the generated types, please see the documentation:
99
// https://github.com/apple/swift-protobuf/
File renamed without changes.

Coder Desktop/project.yml Coder-Desktop/project.yml

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Coder Desktop"
1+
name: "Coder-Desktop"
22
options:
33
bundleIdPrefix: com.coder
44
deploymentTarget:
@@ -121,11 +121,11 @@ targets:
121121
type: application
122122
platform: macOS
123123
sources:
124-
- path: Coder Desktop
124+
- path: Coder-Desktop
125125
- path: Resources
126126
buildPhase: resources
127127
entitlements:
128-
path: Coder Desktop/Coder_Desktop.entitlements
128+
path: Coder-Desktop/Coder-Desktop.entitlements
129129
properties:
130130
com.apple.developer.networking.networkextension:
131131
- packet-tunnel-provider${PTP_SUFFIX}
@@ -140,7 +140,8 @@ targets:
140140
CODE_SIGN_IDENTITY: "Apple Development"
141141
CODE_SIGN_STYLE: Automatic
142142
COMBINE_HIDPI_IMAGES: YES
143-
DEVELOPMENT_ASSET_PATHS: '"Coder Desktop/Preview Content"' # Adds development assets.
143+
DEVELOPMENT_ASSET_PATHS: '"Coder-Desktop/Preview Content"' # Adds development assets.
144+
PRODUCT_DISPLAY_NAME: "Coder Desktop"
144145
ENABLE_HARDENED_RUNTIME: YES
145146
ENABLE_PREVIEWS: YES
146147
INFOPLIST_KEY_LSUIElement: YES
@@ -174,19 +175,19 @@ targets:
174175
- package: LaunchAtLogin
175176
scheme:
176177
testPlans:
177-
- path: Coder Desktop.xctestplan
178+
- path: Coder-Desktop.xctestplan
178179
testTargets:
179-
- Coder DesktopTests
180-
- Coder DesktopUITests
180+
- Coder-DesktopTests
181+
- Coder-DesktopUITests
181182
buildToolPlugins:
182183
- plugin: SwiftLintBuildToolPlugin
183184
package: SwiftLintPlugins
184185

185-
Coder DesktopTests:
186+
Coder-DesktopTests:
186187
type: bundle.unit-test
187188
platform: macOS
188189
sources:
189-
- path: Coder DesktopTests
190+
- path: Coder-DesktopTests
190191
settings:
191192
base:
192193
BUNDLE_LOADER: "$(TEST_HOST)"
@@ -199,11 +200,11 @@ targets:
199200
- package: ViewInspector
200201
- package: Mocker
201202

202-
Coder DesktopUITests:
203+
Coder-DesktopUITests:
203204
type: bundle.ui-testing
204205
platform: macOS
205206
sources:
206-
- path: Coder DesktopUITests
207+
- path: Coder-DesktopUITests
207208
settings:
208209
base:
209210
PRODUCT_BUNDLE_IDENTIFIER: "com.coder.Coder-DesktopUITests"

Makefile

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ LINTFLAGS :=
1414
FMTFLAGS :=
1515
endif
1616

17-
PROJECT := Coder\ Desktop
18-
XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
17+
PROJECT := Coder-Desktop
18+
XCPROJECT := Coder-Desktop/Coder-Desktop.xcodeproj
1919
SCHEME := Coder\ Desktop
20+
TEST_PLAN := Coder-Desktop
2021
SWIFT_VERSION := 6.0
2122

2223
MUTAGEN_RESOURCES := mutagen-agents.tar.gz mutagen-darwin-arm64 mutagen-darwin-amd64
@@ -69,13 +70,13 @@ $(XCPROJECT): $(PROJECT)/project.yml
6970
xcodegen
7071

7172
$(PROJECT)/VPNLib/vpn.pb.swift: $(PROJECT)/VPNLib/vpn.proto
72-
protoc --swift_opt=Visibility=public --swift_out=. 'Coder Desktop/VPNLib/vpn.proto'
73+
protoc --swift_opt=Visibility=public --swift_out=. 'Coder-Desktop/VPNLib/vpn.proto'
7374

7475
$(PROJECT)/VPNLib/FileSync/daemon.pb.swift: $(PROJECT)/VPNLib/FileSync/daemon.proto
7576
protoc \
7677
--swift_out=.\
7778
--grpc-swift_out=. \
78-
'Coder Desktop/VPNLib/FileSync/daemon.proto'
79+
'Coder-Desktop/VPNLib/FileSync/daemon.proto'
7980

8081
$(KEYCHAIN_FILE):
8182
security create-keychain -p "" "$(APP_SIGNING_KEYCHAIN)"
@@ -115,7 +116,7 @@ test: $(XCPROJECT) ## Run all tests
115116
set -o pipefail && xcodebuild test \
116117
-project $(XCPROJECT) \
117118
-scheme $(SCHEME) \
118-
-testPlan $(SCHEME) \
119+
-testPlan $(TEST_PLAN) \
119120
-skipPackagePluginValidation \
120121
CODE_SIGNING_REQUIRED=NO \
121122
CODE_SIGNING_ALLOWED=NO | xcbeautify
@@ -173,6 +174,6 @@ help: ## Show this help
173174

174175
.PHONY: watch-gen
175176
watch-gen: ## Generate Xcode project file and watch for changes
176-
watchexec -w 'Coder Desktop/project.yml' make $(XCPROJECT)
177+
watchexec -w 'Coder-Desktop/project.yml' make $(XCPROJECT)
177178

178179
print-%: ; @echo $*=$($*)

scripts/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ mkdir -p "$out"
116116
mkdir build
117117

118118
# Archive the app
119-
ARCHIVE_PATH="./build/Coder Desktop.xcarchive"
119+
ARCHIVE_PATH="./build/Coder-Desktop.xcarchive"
120120
mkdir -p build
121121

122122
xcodebuild \
123-
-project "Coder Desktop/Coder Desktop.xcodeproj" \
123+
-project "Coder-Desktop/Coder-Desktop.xcodeproj" \
124124
-scheme "Coder Desktop" \
125125
-configuration "Release" \
126126
-archivePath "$ARCHIVE_PATH" \
@@ -165,7 +165,7 @@ xcodebuild \
165165
-exportPath "$EXPORT_PATH"
166166

167167
BUILT_APP_PATH="$EXPORT_PATH/Coder Desktop.app"
168-
PKG_PATH="$out/CoderDesktop.pkg"
168+
PKG_PATH="$out/Coder-Desktop.pkg"
169169
DSYM_ZIPPED_PATH="$out/coder-desktop-dsyms.zip"
170170
APP_ZIPPED_PATH="$out/coder-desktop-universal.zip"
171171

scripts/update-cask.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ done
4444
exit 1
4545
}
4646

47-
# Download the CoderDesktop pkg
47+
# Download the Coder-Desktop pkg
4848
GH_RELEASE_FOLDER=$(mktemp -d)
4949

5050
gh release download "$VERSION" \
5151
--repo coder/coder-desktop-macos \
5252
--dir "$GH_RELEASE_FOLDER" \
53-
--pattern 'CoderDesktop.pkg'
53+
--pattern 'Coder-Desktop.pkg'
5454

55-
HASH=$(shasum -a 256 "$GH_RELEASE_FOLDER"/CoderDesktop.pkg | awk '{print $1}' | tr -d '\n')
55+
HASH=$(shasum -a 256 "$GH_RELEASE_FOLDER"/Coder-Desktop.pkg | awk '{print $1}' | tr -d '\n')
5656

5757
IS_PREVIEW=false
5858
if [[ "$VERSION" == "preview" ]]; then
@@ -97,15 +97,15 @@ cask "coder-desktop${SUFFIX}" do
9797
version "${VERSION#v}"
9898
sha256 $([ "$IS_PREVIEW" = true ] && echo ":no_check" || echo "\"${HASH}\"")
9999
100-
url "https://github.com/coder/coder-desktop-macos/releases/download/$([ "$IS_PREVIEW" = true ] && echo "${TAG}" || echo "v#{version}")/CoderDesktop.pkg"
100+
url "https://github.com/coder/coder-desktop-macos/releases/download/$([ "$IS_PREVIEW" = true ] && echo "${TAG}" || echo "v#{version}")/Coder-Desktop.pkg"
101101
name "Coder Desktop"
102102
desc "Native desktop client for Coder"
103103
homepage "https://github.com/coder/coder-desktop-macos"
104104
105105
conflicts_with cask: "coder/coder/${CONFLICTS_WITH}"
106106
depends_on macos: ">= :sonoma"
107107
108-
pkg "CoderDesktop.pkg"
108+
pkg "Coder-Desktop.pkg"
109109
110110
uninstall quit: [
111111
"com.coder.Coder-Desktop",

0 commit comments

Comments
 (0)