Skip to content

refactor: replace spaces with hyphens in directory names #110

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.

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
merged 3 commits into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,4 @@ release/
.fl5C1A396C

# Embedded mutagen resources
Coder Desktop/Resources/mutagen-*
Coder-Desktop/Resources/mutagen-*
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ make
```

This will use **XcodeGen** to create the required Xcode project files.
The configuration for the project is defined in `Coder Desktop/project.yml`.
The configuration for the project is defined in `Coder-Desktop/project.yml`.

## Common Make Commands

Expand All @@ -96,7 +96,7 @@ For continuous development, you can also use:
make watch-gen
```

This command watches for changes to `Coder Desktop/project.yml` and regenerates
This command watches for changes to `Coder-Desktop/project.yml` and regenerates
the Xcode project file as needed.

## Testing and Formatting
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
],
"defaultOptions" : {
"targetForVariableExpansion" : {
"containerPath" : "container:Coder Desktop.xcodeproj",
"containerPath" : "container:Coder-Desktop.xcodeproj",
"identifier" : "961678FB2CFF100D00B2B6DF",
"name" : "Coder Desktop"
}
},
"testTargets" : [
{
"target" : {
"containerPath" : "container:Coder Desktop.xcodeproj",
"containerPath" : "container:Coder-Desktop.xcodeproj",
"identifier" : "AA3B40972D2FC8560099996A",
"name" : "CoderSDKTests"
}
Expand All @@ -27,23 +27,23 @@
"enabled" : false,
"parallelizable" : true,
"target" : {
"containerPath" : "container:Coder Desktop.xcodeproj",
"containerPath" : "container:Coder-Desktop.xcodeproj",
"identifier" : "961679182CFF100E00B2B6DF",
"name" : "Coder DesktopUITests"
"name" : "Coder-DesktopUITests"
}
},
{
"target" : {
"containerPath" : "container:Coder Desktop.xcodeproj",
"containerPath" : "container:Coder-Desktop.xcodeproj",
"identifier" : "AA3B3DA72D2D23860099996A",
"name" : "VPNLibTests"
}
},
{
"target" : {
"containerPath" : "container:Coder Desktop.xcodeproj",
"containerPath" : "container:Coder-Desktop.xcodeproj",
"identifier" : "9616790E2CFF100E00B2B6DF",
"name" : "Coder DesktopTests"
"name" : "Coder-DesktopTests"
}
}
],
Expand Down
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.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// swift-format-ignore-file
//
// Generated by the protocol buffer compiler.
// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
// Source: Coder-Desktop/VPNLib/FileSync/daemon.proto
//
import GRPC
import NIO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// swiftlint:disable all
//
// Generated by the Swift generator plugin for the protocol buffer compiler.
// Source: Coder Desktop/VPNLib/FileSync/daemon.proto
// Source: Coder-Desktop/VPNLib/FileSync/daemon.proto
//
// For information on using the generated types, please see the documentation:
// https://github.com/apple/swift-protobuf/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// swiftlint:disable all
//
// Generated by the Swift generator plugin for the protocol buffer compiler.
// Source: Coder Desktop/VPNLib/vpn.proto
// Source: Coder-Desktop/VPNLib/vpn.proto
//
// For information on using the generated types, please see the documentation:
// https://github.com/apple/swift-protobuf/
Expand Down
File renamed without changes.
22 changes: 11 additions & 11 deletions Coder Desktop/project.yml → Coder-Desktop/project.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Coder Desktop"
name: "Coder-Desktop"
options:
bundleIdPrefix: com.coder
deploymentTarget:
Expand Down Expand Up @@ -121,11 +121,11 @@ targets:
type: application
platform: macOS
sources:
- path: Coder Desktop
- path: Coder-Desktop
- path: Resources
buildPhase: resources
entitlements:
path: Coder Desktop/Coder_Desktop.entitlements
path: Coder-Desktop/Coder-Desktop.entitlements
properties:
com.apple.developer.networking.networkextension:
- packet-tunnel-provider${PTP_SUFFIX}
Expand All @@ -140,7 +140,7 @@ targets:
CODE_SIGN_IDENTITY: "Apple Development"
CODE_SIGN_STYLE: Automatic
COMBINE_HIDPI_IMAGES: YES
DEVELOPMENT_ASSET_PATHS: '"Coder Desktop/Preview Content"' # Adds development assets.
DEVELOPMENT_ASSET_PATHS: '"Coder-Desktop/Preview Content"' # Adds development assets.
ENABLE_HARDENED_RUNTIME: YES
ENABLE_PREVIEWS: YES
INFOPLIST_KEY_LSUIElement: YES
Expand Down Expand Up @@ -174,19 +174,19 @@ targets:
- package: LaunchAtLogin
scheme:
testPlans:
- path: Coder Desktop.xctestplan
- path: Coder-Desktop.xctestplan
testTargets:
- Coder DesktopTests
- Coder DesktopUITests
- Coder-DesktopTests
- Coder-DesktopUITests
buildToolPlugins:
- plugin: SwiftLintBuildToolPlugin
package: SwiftLintPlugins

Coder DesktopTests:
Coder-DesktopTests:
type: bundle.unit-test
platform: macOS
sources:
- path: Coder DesktopTests
- path: Coder-DesktopTests
settings:
base:
BUNDLE_LOADER: "$(TEST_HOST)"
Expand All @@ -199,11 +199,11 @@ targets:
- package: ViewInspector
- package: Mocker

Coder DesktopUITests:
Coder-DesktopUITests:
type: bundle.ui-testing
platform: macOS
sources:
- path: Coder DesktopUITests
- path: Coder-DesktopUITests
settings:
base:
PRODUCT_BUNDLE_IDENTIFIER: "com.coder.Coder-DesktopUITests"
Expand Down
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ LINTFLAGS :=
FMTFLAGS :=
endif

PROJECT := Coder\ Desktop
XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
PROJECT := Coder-Desktop
XCPROJECT := Coder-Desktop/Coder-Desktop.xcodeproj
SCHEME := Coder\ Desktop
TEST_PLAN := Coder-Desktop
SWIFT_VERSION := 6.0

MUTAGEN_RESOURCES := mutagen-agents.tar.gz mutagen-darwin-arm64 mutagen-darwin-amd64
Expand Down Expand Up @@ -55,7 +56,7 @@ setup: \

# Mutagen resources
$(addprefix $(PROJECT)/Resources/,$(MUTAGEN_RESOURCES)): $(PROJECT)/Resources/.mutagenversion
curl -sL "https://storage.googleapis.com/coder-desktop/mutagen/$(MUTAGEN_VERSION)/$$(basename "$@")" -o "$@"
curl -sL "https://storage.googleapis.com/coder-desktop/mutagen/$(MUTAGEN_VERSION)/$(notdir $@)" -o "$@"
chmod +x "$@"

$(XCPROJECT): $(PROJECT)/project.yml
Expand All @@ -69,13 +70,13 @@ $(XCPROJECT): $(PROJECT)/project.yml
xcodegen

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

$(PROJECT)/VPNLib/FileSync/daemon.pb.swift: $(PROJECT)/VPNLib/FileSync/daemon.proto
protoc \
--swift_out=.\
--grpc-swift_out=. \
'Coder Desktop/VPNLib/FileSync/daemon.proto'
'Coder-Desktop/VPNLib/FileSync/daemon.proto'

$(KEYCHAIN_FILE):
security create-keychain -p "" "$(APP_SIGNING_KEYCHAIN)"
Expand Down Expand Up @@ -115,7 +116,7 @@ test: $(XCPROJECT) ## Run all tests
set -o pipefail && xcodebuild test \
-project $(XCPROJECT) \
-scheme $(SCHEME) \
-testPlan $(SCHEME) \
-testPlan $(TEST_PLAN) \
-skipPackagePluginValidation \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGNING_ALLOWED=NO | xcbeautify
Expand Down Expand Up @@ -173,6 +174,6 @@ help: ## Show this help

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

print-%: ; @echo $*=$($*)
6 changes: 3 additions & 3 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ mkdir -p "$out"
mkdir build

# Archive the app
ARCHIVE_PATH="./build/Coder Desktop.xcarchive"
ARCHIVE_PATH="./build/Coder-Desktop.xcarchive"
mkdir -p build

xcodebuild \
-project "Coder Desktop/Coder Desktop.xcodeproj" \
-project "Coder-Desktop/Coder-Desktop.xcodeproj" \
-scheme "Coder Desktop" \
-configuration "Release" \
-archivePath "$ARCHIVE_PATH" \
Expand Down Expand Up @@ -165,7 +165,7 @@ xcodebuild \
-exportPath "$EXPORT_PATH"

BUILT_APP_PATH="$EXPORT_PATH/Coder Desktop.app"
PKG_PATH="$out/CoderDesktop.pkg"
PKG_PATH="$out/Coder-Desktop.pkg"
DSYM_ZIPPED_PATH="$out/coder-desktop-dsyms.zip"
APP_ZIPPED_PATH="$out/coder-desktop-universal.zip"

Expand Down
10 changes: 5 additions & 5 deletions scripts/update-cask.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ done
exit 1
}

# Download the CoderDesktop pkg
# Download the Coder-Desktop pkg
GH_RELEASE_FOLDER=$(mktemp -d)

gh release download "$VERSION" \
--repo coder/coder-desktop-macos \
--dir "$GH_RELEASE_FOLDER" \
--pattern 'CoderDesktop.pkg'
--pattern 'Coder-Desktop.pkg'

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

IS_PREVIEW=false
if [[ "$VERSION" == "preview" ]]; then
Expand Down Expand Up @@ -97,15 +97,15 @@ cask "coder-desktop${SUFFIX}" do
version "${VERSION#v}"
sha256 $([ "$IS_PREVIEW" = true ] && echo ":no_check" || echo "\"${HASH}\"")

url "https://github.com/coder/coder-desktop-macos/releases/download/$([ "$IS_PREVIEW" = true ] && echo "${TAG}" || echo "v#{version}")/CoderDesktop.pkg"
url "https://github.com/coder/coder-desktop-macos/releases/download/$([ "$IS_PREVIEW" = true ] && echo "${TAG}" || echo "v#{version}")/Coder-Desktop.pkg"
name "Coder Desktop"
desc "Native desktop client for Coder"
homepage "https://github.com/coder/coder-desktop-macos"

conflicts_with cask: "coder/coder/${CONFLICTS_WITH}"
depends_on macos: ">= :sonoma"

pkg "CoderDesktop.pkg"
pkg "Coder-Desktop.pkg"

uninstall quit: [
"com.coder.Coder-Desktop",
Expand Down
Loading