Skip to content

Commit 7dad28f

Browse files
authored
Merge pull request #3271 from scala-steward-org/topic/rm-vcs-options
Remove `--vcs-*` options
2 parents fa630e3 + e2fe76c commit 7dad28f

File tree

2 files changed

+2
-30
lines changed
  • docs
  • modules/core/src/main/scala/org/scalasteward/core/application

2 files changed

+2
-30
lines changed

docs/help.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ Options and flags:
3030
Whether to signoff commits; default: false
3131
--forge-type <forge-type>
3232
One of azure-repos, bitbucket, bitbucket-server, github, gitlab, gitea; default: github
33-
--vcs-type <forge-type>
34-
deprecated in favor of --forge-type
3533
--forge-api-host <uri>
3634
API URL of the forge; default: https://api.github.com
37-
--vcs-api-host <uri>
38-
deprecated in favor of --forge-api-host
3935
--forge-login <string>
4036
The user name for the forge
41-
--vcs-login <string>
42-
deprecated in favor of --forge-login
4337
--do-not-fork
4438
Whether to not push the update branches to a fork; default: false
4539
--add-labels

modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,40 +111,18 @@ object Cli {
111111
private val gitCfg: Opts[GitCfg] =
112112
(gitAuthor, gitAskPass, signCommits, signoff).mapN(GitCfg.apply)
113113

114-
private val vcsType =
115-
option[ForgeType](
116-
"vcs-type",
117-
s"deprecated in favor of --${name.forgeType}",
118-
visibility = Visibility.Partial
119-
).validate(s"--vcs-type is deprecated; use --${name.forgeType} instead")(_ => false)
120-
121114
private val forgeType = {
122115
val help = ForgeType.all.map(_.asString).mkString("One of ", ", ", "") +
123116
s"; default: ${GitHub.asString}"
124-
option[ForgeType](name.forgeType, help).orElse(vcsType).withDefault(GitHub)
117+
option[ForgeType](name.forgeType, help).withDefault(GitHub)
125118
}
126119

127-
private val vcsApiHost =
128-
option[Uri](
129-
"vcs-api-host",
130-
s"deprecated in favor of --${name.forgeApiHost}",
131-
visibility = Visibility.Partial
132-
).validate(s"--vcs-api-host is deprecated; use --${name.forgeApiHost} instead")(_ => false)
133-
134120
private val forgeApiHost: Opts[Uri] =
135121
option[Uri](name.forgeApiHost, s"API URL of the forge; default: ${GitHub.publicApiBaseUrl}")
136-
.orElse(vcsApiHost)
137122
.withDefault(GitHub.publicApiBaseUrl)
138123

139-
private val vcsLogin =
140-
option[String](
141-
"vcs-login",
142-
s"deprecated in favor of --${name.forgeLogin}",
143-
visibility = Visibility.Partial
144-
).validate(s"--vcs-login is deprecated; use --${name.forgeLogin} instead")(_ => false)
145-
146124
private val forgeLogin: Opts[String] =
147-
option[String](name.forgeLogin, "The user name for the forge").orElse(vcsLogin)
125+
option[String](name.forgeLogin, "The user name for the forge")
148126

149127
private val doNotFork: Opts[Boolean] =
150128
flag("do-not-fork", "Whether to not push the update branches to a fork; default: false").orFalse

0 commit comments

Comments
 (0)