Skip to content

Commit e8920f9

Browse files
committed
Merge remote-tracking branch 'origin/main' into dfrancoeur/2942-gitignore
2 parents dd59993 + 5216d47 commit e8920f9

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

docs/help.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ Options and flags:
8383
--azure-repos-organization <string>
8484
The Azure organization (required when --forge-type is azure-repos)
8585
--github-app-id <integer>
86-
GitHub application id
86+
GitHub application id. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required.
8787
--github-app-key-file <file>
88-
GitHub application key file
88+
GitHub application key file. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required.
8989
--url-checker-test-url <uri>
9090
URL for testing the UrlChecker at start-up (can be used multiple times); default: https://github.com
9191
--default-maven-repo <string>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,16 @@ object Cli {
284284
(gitlabMergeWhenPipelineSucceeds, gitlabRequiredReviewers).mapN(GitLabCfg.apply)
285285

286286
private val githubAppId: Opts[Long] =
287-
option[Long]("github-app-id", "GitHub application id")
287+
option[Long](
288+
"github-app-id",
289+
"GitHub application id. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
290+
)
288291

289292
private val githubAppKeyFile: Opts[File] =
290-
option[File]("github-app-key-file", "GitHub application key file")
293+
option[File](
294+
"github-app-key-file",
295+
"GitHub application key file. Repos accessible by this app are added to the repos in repos.md. git-ask-pass is still required."
296+
)
291297

292298
private val gitHubApp: Opts[Option[GitHubApp]] =
293299
(githubAppId, githubAppKeyFile).mapN(GitHubApp.apply).orNone

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbt._
33
object Dependencies {
44
val bcprovJdk15to18 = "org.bouncycastle" % "bcprov-jdk15to18" % "1.72"
55
val betterFiles = "com.github.pathikrit" %% "better-files" % "3.9.2"
6-
val catsEffect = "org.typelevel" %% "cats-effect" % "3.4.7"
6+
val catsEffect = "org.typelevel" %% "cats-effect" % "3.4.8"
77
val catsCore = "org.typelevel" %% "cats-core" % "2.9.0"
88
val catsLaws = "org.typelevel" %% "cats-laws" % catsCore.revision
99
val catsParse = "org.typelevel" %% "cats-parse" % "0.3.9"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
44
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
55
addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
66
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
7-
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.15")
7+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
88
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
99
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
1010
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4")

0 commit comments

Comments
 (0)