Merge pull request #1390 from Carthage/build-platform-macos

[carthage] Accept `macOS` for `--platform` option
Carthage · Jul 18, 2016 · d4216b4 · d4216b4
2 parents 17dbf5f + 96e290f
commit d4216b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Source/Scripts/carthage-bash-completion b/Source/Scripts/carthage-bash-completion
@@ -67,7 +67,7 @@ _carthage() {
             return 0
             ;;
         --platform)
-            COMPREPLY=($(compgen -W 'all iOS Mac watchOS tvOS' -- ${cur}))
+            COMPREPLY=($(compgen -W 'all macOS iOS watchOS tvOS' -- ${cur}))
             return 0
             ;;
         --derived-data)

diff --git a/Source/Scripts/carthage-fish-completion b/Source/Scripts/carthage-fish-completion
@@ -22,7 +22,7 @@ complete -c carthage -n '__fish_prog_using_subcommand archive' -l output -r
 complete -c carthage -n '__fish_prog_using_subcommand archive' -l color -a "auto always never" -x
 
 complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l configuration -x -a "Release Debug"
-complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l platform -x -a "all Mac OSX iOS watchOS tvOS"
+complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l platform -x -a "all macOS iOS watchOS tvOS"
 complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l verbose
 complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l no-checkout
 complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l no-build
@@ -34,7 +34,7 @@ complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l project-dire
 complete -c carthage -n '__fish_prog_using_subcommand bootstrap' -l derived-data -x -a '(__fish_complete_directories (commandline -ct))'
 
 complete -c carthage -n '__fish_prog_using_subcommand build' -l configuration -x -a "Release Debug"
-complete -c carthage -n '__fish_prog_using_subcommand build' -l platform -x -a "all Mac OSX iOS watchOS tvOS"
+complete -c carthage -n '__fish_prog_using_subcommand build' -l platform -x -a "all macOS iOS watchOS tvOS"
 complete -c carthage -n '__fish_prog_using_subcommand build' -l no-skip-current
 complete -c carthage -n '__fish_prog_using_subcommand build' -l color -a "auto always never" -x
 complete -c carthage -n '__fish_prog_using_subcommand build' -l verbose
@@ -52,7 +52,7 @@ complete -c carthage -n '__fish_prog_using_subcommand fetch' -l color -a "auto a
 complete -c carthage -n '__fish_prog_using_subcommand help' -a "archive bootstrap build checkout copy-frameworks fetch help update version" -f
 
 complete -c carthage -n '__fish_prog_using_subcommand update' -l configuration -x -a "Release Debug"
-complete -c carthage -n '__fish_prog_using_subcommand update' -l platform -x -a "all Mac OSX iOS watchOS tvOS"
+complete -c carthage -n '__fish_prog_using_subcommand update' -l platform -x -a "all macOS iOS watchOS tvOS"
 complete -c carthage -n '__fish_prog_using_subcommand update' -l verbose
 complete -c carthage -n '__fish_prog_using_subcommand update' -l no-checkout
 complete -c carthage -n '__fish_prog_using_subcommand update' -l no-build

diff --git a/Source/Scripts/carthage-zsh-completion b/Source/Scripts/carthage-zsh-completion
@@ -46,7 +46,7 @@ _carthage() {
                 (bootstrap|update)
                     _arguments -C \
                         '--configuration: :(Release Debug)' \
-                        '--platform: :(all iOS Mac watchOS tvOS)' \
+                        '--platform: :(all macOS iOS watchOS tvOS)' \
                         '--use-ssh' \
                         '--use-submodules' \
                         '--no-use-binaries' \
@@ -62,7 +62,7 @@ _carthage() {
                 (build)
                     _arguments \
                         '--configuration: :(Release Debug)' \
-                        '--platform: :(all iOS Mac watchOS tvOS)' \
+                        '--platform: :(all macOS iOS watchOS tvOS)' \
                         '--no-skip-current' \
                         '--color: :(auto always never)' \
                         '--verbose' \

diff --git a/Source/carthage/Build.swift b/Source/carthage/Build.swift
@@ -298,7 +298,7 @@ extension BuildPlatform: ArgumentType {
 	public static let name = "platform"
 
 	private static let acceptedStrings: [String: BuildPlatform] = [
-		"Mac": .Mac, "OSX": .Mac, "macosx": .Mac,
+		"macOS": .Mac, "Mac": .Mac, "OSX": .Mac, "macosx": .Mac,
 		"iOS": .iOS, "iphoneos": .iOS, "iphonesimulator": .iOS,
 		"watchOS": .watchOS, "watchsimulator": .watchOS,
 		"tvOS": .tvOS, "tvsimulator": .tvOS,