diff --git a/docs/help.md b/docs/help.md index badf42730..e810cc3f2 100644 --- a/docs/help.md +++ b/docs/help.md @@ -30,16 +30,10 @@ Options and flags: Whether to signoff commits; default: false --forge-type One of azure-repos, bitbucket, bitbucket-server, github, gitlab, gitea; default: github - --vcs-type - deprecated in favor of --forge-type --forge-api-host API URL of the forge; default: https://api.github.com - --vcs-api-host - deprecated in favor of --forge-api-host --forge-login The user name for the forge - --vcs-login - deprecated in favor of --forge-login --do-not-fork Whether to not push the update branches to a fork; default: false --add-labels diff --git a/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala b/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala index 4964ed831..c7eb1d550 100644 --- a/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala +++ b/modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala @@ -111,40 +111,18 @@ object Cli { private val gitCfg: Opts[GitCfg] = (gitAuthor, gitAskPass, signCommits, signoff).mapN(GitCfg.apply) - private val vcsType = - option[ForgeType]( - "vcs-type", - s"deprecated in favor of --${name.forgeType}", - visibility = Visibility.Partial - ).validate(s"--vcs-type is deprecated; use --${name.forgeType} instead")(_ => false) - private val forgeType = { val help = ForgeType.all.map(_.asString).mkString("One of ", ", ", "") + s"; default: ${GitHub.asString}" - option[ForgeType](name.forgeType, help).orElse(vcsType).withDefault(GitHub) + option[ForgeType](name.forgeType, help).withDefault(GitHub) } - private val vcsApiHost = - option[Uri]( - "vcs-api-host", - s"deprecated in favor of --${name.forgeApiHost}", - visibility = Visibility.Partial - ).validate(s"--vcs-api-host is deprecated; use --${name.forgeApiHost} instead")(_ => false) - private val forgeApiHost: Opts[Uri] = option[Uri](name.forgeApiHost, s"API URL of the forge; default: ${GitHub.publicApiBaseUrl}") - .orElse(vcsApiHost) .withDefault(GitHub.publicApiBaseUrl) - private val vcsLogin = - option[String]( - "vcs-login", - s"deprecated in favor of --${name.forgeLogin}", - visibility = Visibility.Partial - ).validate(s"--vcs-login is deprecated; use --${name.forgeLogin} instead")(_ => false) - private val forgeLogin: Opts[String] = - option[String](name.forgeLogin, "The user name for the forge").orElse(vcsLogin) + option[String](name.forgeLogin, "The user name for the forge") private val doNotFork: Opts[Boolean] = flag("do-not-fork", "Whether to not push the update branches to a fork; default: false").orFalse