Skip to content

Commit e2fe76c

Browse files
committed
Remove --vcs-* options
Successor to scala-steward-org#3241. This should not be merged before Q3 2024 so that people had enough time to see the current deprecation messages and migrate to the `--forge-*` options.
1 parent 33d3ad7 commit e2fe76c

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
@@ -28,16 +28,10 @@ Options and flags:
2828
Whether to sign commits; default: false
2929
--forge-type <forge-type>
3030
One of azure-repos, bitbucket, bitbucket-server, github, gitlab, gitea; default: github
31-
--vcs-type <forge-type>
32-
deprecated in favor of --forge-type
3331
--forge-api-host <uri>
3432
API URL of the forge; default: https://api.github.com
35-
--vcs-api-host <uri>
36-
deprecated in favor of --forge-api-host
3733
--forge-login <string>
3834
The user name for the forge
39-
--vcs-login <string>
40-
deprecated in favor of --forge-login
4135
--do-not-fork
4236
Whether to not push the update branches to a fork; default: false
4337
--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
@@ -102,40 +102,18 @@ object Cli {
102102
private val gitCfg: Opts[GitCfg] =
103103
(gitAuthor, gitAskPass, signCommits).mapN(GitCfg.apply)
104104

105-
private val vcsType =
106-
option[ForgeType](
107-
"vcs-type",
108-
s"deprecated in favor of --${name.forgeType}",
109-
visibility = Visibility.Partial
110-
).validate(s"--vcs-type is deprecated; use --${name.forgeType} instead")(_ => false)
111-
112105
private val forgeType = {
113106
val help = ForgeType.all.map(_.asString).mkString("One of ", ", ", "") +
114107
s"; default: ${GitHub.asString}"
115-
option[ForgeType](name.forgeType, help).orElse(vcsType).withDefault(GitHub)
108+
option[ForgeType](name.forgeType, help).withDefault(GitHub)
116109
}
117110

118-
private val vcsApiHost =
119-
option[Uri](
120-
"vcs-api-host",
121-
s"deprecated in favor of --${name.forgeApiHost}",
122-
visibility = Visibility.Partial
123-
).validate(s"--vcs-api-host is deprecated; use --${name.forgeApiHost} instead")(_ => false)
124-
125111
private val forgeApiHost: Opts[Uri] =
126112
option[Uri](name.forgeApiHost, s"API URL of the forge; default: ${GitHub.publicApiBaseUrl}")
127-
.orElse(vcsApiHost)
128113
.withDefault(GitHub.publicApiBaseUrl)
129114

130-
private val vcsLogin =
131-
option[String](
132-
"vcs-login",
133-
s"deprecated in favor of --${name.forgeLogin}",
134-
visibility = Visibility.Partial
135-
).validate(s"--vcs-login is deprecated; use --${name.forgeLogin} instead")(_ => false)
136-
137115
private val forgeLogin: Opts[String] =
138-
option[String](name.forgeLogin, "The user name for the forge").orElse(vcsLogin)
116+
option[String](name.forgeLogin, "The user name for the forge")
139117

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

0 commit comments

Comments
 (0)