16154453ea701772acd144f22d3ddf9b6f3a40d3

Author
Reza Hamouleh <satrap92@gmail.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

sbt: use new sbt command naming convention (#8426)


Diff

 1diff --git a/plugins/sbt/README.md b/plugins/sbt/README.md
 2index f1a5753b91121201bebaa1b1deb5afa601a7c933..f0201938e6e79987020865d5fe1b6562ccefd1a2 100644
 3--- a/plugins/sbt/README.md
 4+++ b/plugins/sbt/README.md
 5@@ -17,16 +17,16 @@ plugins=(... sbt)
 6 | sbcln | `sbt clean`           | Deletes all generated files                                  |
 7 | sbcc  | `sbt clean compile`   | Deletes generated files, compiles the main sources           |
 8 | sbco  | `sbt console`         | Starts Scala with the compiled sources and all dependencies  |
 9-| sbcq  | `sbt console-quick`   | Starts Scala with all dependencies                           |
10-| sbcp  | `sbt console-project` | Starts Scala with sbt and the build definitions              |
11+| sbcq  | `sbt consoleQuick`    | Starts Scala with all dependencies                           |
12+| sbcp  | `sbt consoleProject`  | Starts Scala with sbt and the build definitions              |
13 | sbd   | `sbt doc`             | Generates API documentation for Scala source files           |
14 | sbdc  | `sbt dist:clean`      | Deletes the distribution packages                            |
15 | sbdi  | `sbt dist`            | Creates the distribution packages                            |
16-| sbgi  | `sbt gen-idea`        | Create Idea project files                                    |
17+| sbgi  | `sbt genIdea`         | Create Idea project files                                    |
18 | sbp   | `sbt publish`         | Publishes artifacts to the repository                        |
19-| sbpl  | `sbt publish-local`   | Publishes artifacts to the local Ivy repository              |
20+| sbpl  | `sbt publishLocal`    | Publishes artifacts to the local Ivy repository              |
21 | sbr   | `sbt run`             | Runs the main class for the project                          |
22-| sbrm  | `sbt run-main`        | Runs the specified main class for the project                |
23+| sbrm  | `sbt runMain`         | Runs the specified main class for the project                |
24 | sbu   | `sbt update`          | Resolves and retrieves external dependencies                 |
25 | sbx   | `sbt test`            | Compiles and runs all tests                                  |
26 | sba   | `sbt assembly`        | Create a fat JAR with all dependencies                       |
27diff --git a/plugins/sbt/_sbt b/plugins/sbt/_sbt
28index a601c9b973c67add9227b29846e122ca4adad93f..2138a722fd59d8c28bce5a379a184dc18b0d1bb8 100644
29--- a/plugins/sbt/_sbt
30+++ b/plugins/sbt/_sbt
31@@ -6,23 +6,23 @@ _sbt_commands=(
32   'clean:delete files produced by the build'
33   'compile:compile sources'
34   'console:start the Scala REPL with project classes on the classpath'
35-  'console-quick:start the Scala REPL with project deps on the classpath'
36-  'console-project:start the Scala REPL w/sbt+build-def on the classpath'
37+  'consoleQuick:start the Scala REPL with project deps on the classpath'
38+  'consoleProject:start the Scala REPL w/sbt+build-def on the classpath'
39   'dist:generate distribution artifacts'
40   'dist\:clean:clean distribution artifacts'
41   'doc:generate API documentation'
42-  'gen-idea:generate Intellij Idea project files'
43+  'genIdea:generate Intellij Idea project files'
44   'package:produce the main artifact, such as a binary jar'
45-  'package-doc:produce a doc artifact, such as a jar containing API docs'
46-  'package-src:produce a source artifact, such as a jar containing sources'
47+  'packageDoc:produce a doc artifact, such as a jar containing API docs'
48+  'packageSrc:produce a source artifact, such as a jar containing sources'
49   'publish:publish artifacts to a repository'
50-  'publish-local:publish artifacts to the local repository'
51-  'publish-m2:publish artifacts to the local Maven 2 repository'
52+  'publishLocal:publish artifacts to the local repository'
53+  'publishM2:publish artifacts to the local Maven 2 repository'
54   'run:run a main class'
55-  'run-main:run the main class selected by the first argument'
56+  'runMain:run the main class selected by the first argument'
57   'test:execute all tests'
58-  'test-only:execute the tests provided as arguments'
59-  'test-quick:execute previously failed tests'
60+  'testOnly:execute the tests provided as arguments'
61+  'testQuick:execute previously failed tests'
62   'update:resolve and optionally retrieve dependencies'
63 )
64 
65diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh
66index f883b7feecda75229171eeb03869f701e1cd6a84..851302c68740aecc0717cdaa69bae3485a809277 100644
67--- a/plugins/sbt/sbt.plugin.zsh
68+++ b/plugins/sbt/sbt.plugin.zsh
69@@ -9,17 +9,17 @@
70 alias sbc='sbt compile'
71 alias sbcc='sbt clean compile'
72 alias sbco='sbt console'
73-alias sbcq='sbt console-quick'
74+alias sbcq='sbt consoleQuick'
75 alias sbcln='sbt clean'
76-alias sbcp='sbt console-project'
77+alias sbcp='sbt consoleProject'
78 alias sbd='sbt doc'
79 alias sbdc='sbt dist:clean'
80 alias sbdi='sbt dist'
81-alias sbgi='sbt gen-idea'
82+alias sbgi='sbt genIdea'
83 alias sbp='sbt publish'
84-alias sbpl='sbt publish-local'
85+alias sbpl='sbt publishLocal'
86 alias sbr='sbt run'
87-alias sbrm='sbt run-main'
88+alias sbrm='sbt runMain'
89 alias sbu='sbt update'
90 alias sbx='sbt test'
91 alias sba='sbt assembly'