Skip to content
This repository was archived by the owner on Oct 14, 2024. It is now read-only.

Commit 1d9d618

Browse files
dependabot[bot]ZacSweers
dependabot[bot]
and
ZacSweers
authored
Bump com.github.ajalt.clikt:clikt from 4.4.0 to 5.0.0 (#190)
* Bump com.github.ajalt.clikt:clikt from 4.4.0 to 5.0.0 Bumps [com.github.ajalt.clikt:clikt](https://github.com/ajalt/clikt) from 4.4.0 to 5.0.0. - [Release notes](https://github.com/ajalt/clikt/releases) - [Changelog](https://github.com/ajalt/clikt/blob/master/CHANGELOG.md) - [Commits](ajalt/clikt@4.4.0...5.0.0) --- updated-dependencies: - dependency-name: com.github.ajalt.clikt:clikt dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update APIs * Update API and detekt * update another --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zac Sweers <[email protected]>
1 parent 15e2b07 commit 1d9d618

File tree

10 files changed

+37
-13
lines changed

10 files changed

+37
-13
lines changed

‎api/kotlin-cli-util.api‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public abstract interface class slack/cli/CommandFactory {
4747
}
4848

4949
public final class slack/cli/CommandFactoryKt {
50-
public static final fun runCommand ([Ljava/lang/String;Z)V
51-
public static synthetic fun runCommand$default ([Ljava/lang/String;ZILjava/lang/Object;)V
50+
public static final fun runCommand (Ljava/util/List;Z)V
51+
public static synthetic fun runCommand$default (Ljava/util/List;ZILjava/lang/Object;)V
5252
}
5353

5454
public final class slack/cli/Playground {
@@ -3447,6 +3447,7 @@ public final class slack/cli/buildkite/With$UnionArrayValue$Companion {
34473447
public final class slack/cli/gradle/GradleProjectFlattenerCli : com/github/ajalt/clikt/core/CliktCommand {
34483448
public static final field DESCRIPTION Ljava/lang/String;
34493449
public fun <init> ()V
3450+
public fun help (Lcom/github/ajalt/clikt/core/Context;)Ljava/lang/String;
34503451
public fun run ()V
34513452
}
34523453

@@ -3460,6 +3461,7 @@ public final class slack/cli/gradle/GradleProjectFlattenerCli$Factory : slack/cl
34603461
public final class slack/cli/gradle/GradleSettingsVerifierCli : com/github/ajalt/clikt/core/CliktCommand {
34613462
public static final field DESCRIPTION Ljava/lang/String;
34623463
public fun <init> ()V
3464+
public fun help (Lcom/github/ajalt/clikt/core/Context;)Ljava/lang/String;
34633465
public fun run ()V
34643466
}
34653467

@@ -3475,6 +3477,7 @@ public final class slack/cli/gradle/GradleTestFixturesMigratorCli : com/github/a
34753477
public static final field DESCRIPTION Ljava/lang/String;
34763478
public static final field JAVA_FIXTURES_BLOCK Ljava/lang/String;
34773479
public fun <init> ()V
3480+
public fun help (Lcom/github/ajalt/clikt/core/Context;)Ljava/lang/String;
34783481
public fun run ()V
34793482
}
34803483

@@ -3501,6 +3504,7 @@ public final class slack/cli/lint/LintBaselineMergerCli$Factory : slack/cli/Comm
35013504
public final class slack/cli/sarif/ApplyBaselinesToSarifs : com/github/ajalt/clikt/core/CliktCommand {
35023505
public static final field DESCRIPTION Ljava/lang/String;
35033506
public fun <init> ()V
3507+
public fun help (Lcom/github/ajalt/clikt/core/Context;)Ljava/lang/String;
35043508
public fun run ()V
35053509
}
35063510

@@ -3514,6 +3518,7 @@ public final class slack/cli/sarif/ApplyBaselinesToSarifs$Factory : slack/cli/Co
35143518
public final class slack/cli/sarif/MergeSarifReports : com/github/ajalt/clikt/core/CliktCommand {
35153519
public static final field DESCRIPTION Ljava/lang/String;
35163520
public fun <init> ()V
3521+
public fun help (Lcom/github/ajalt/clikt/core/Context;)Ljava/lang/String;
35173522
public fun run ()V
35183523
}
35193524

@@ -3644,7 +3649,7 @@ public final class slack/cli/shellsentry/ShellSentry {
36443649
}
36453650

36463651
public final class slack/cli/shellsentry/ShellSentry$Companion {
3647-
public final fun create ([Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lslack/cli/shellsentry/ShellSentry;
3652+
public final fun create (Ljava/util/List;Lkotlin/jvm/functions/Function1;)Lslack/cli/shellsentry/ShellSentry;
36483653
}
36493654

36503655
public final class slack/cli/shellsentry/ShellSentryCli : com/github/ajalt/clikt/core/CliktCommand {

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ retry = { id = "org.gradle.test-retry", version = "1.6.0" }
2626
autoService-annotations = "com.google.auto.service:auto-service-annotations:1.1.1"
2727
autoService-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.2.0"
2828
bugsnag = "com.bugsnag:bugsnag:3.7.2"
29-
clikt = "com.github.ajalt.clikt:clikt:4.4.0"
29+
clikt = "com.github.ajalt.clikt:clikt:5.0.0"
3030
kotlinShell = "eu.jrie.jetbrains:kotlin-shell-core:0.2.1"
3131
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
3232
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }

‎src/main/kotlin/slack/cli/CommandFactory.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.main
1920
import java.util.ServiceLoader
2021
import kotlin.system.exitProcess
2122

@@ -31,7 +32,7 @@ public interface CommandFactory {
3132
* Primary entry point to run any command registered via [CommandFactory]. First argument should be
3233
* the command key and remaining arguments are passed to the created CLI.
3334
*/
34-
public fun runCommand(args: Array<String>, exitOnError: Boolean = true) {
35+
public fun runCommand(args: List<String>, exitOnError: Boolean = true) {
3536
val commands = ServiceLoader.load(CommandFactory::class.java).associateBy { it.key }
3637

3738
if (args.isEmpty()) {
@@ -46,8 +47,8 @@ public fun runCommand(args: Array<String>, exitOnError: Boolean = true) {
4647
val command = args[0]
4748
val commandArgs =
4849
when (args.size) {
49-
1 -> emptyArray()
50-
else -> args.sliceArray(1..args.lastIndex)
50+
1 -> emptyList()
51+
else -> args.subList(1, args.lastIndex)
5152
}
5253

5354
commands[command]?.create()?.main(commandArgs) ?: error("Unknown command: '$command'")

‎src/main/kotlin/slack/cli/gradle/GradleProjectFlattenerCli.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli.gradle
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.Context
1920
import com.github.ajalt.clikt.parameters.options.default
2021
import com.github.ajalt.clikt.parameters.options.flag
2122
import com.github.ajalt.clikt.parameters.options.option
@@ -44,7 +45,7 @@ import slack.cli.projectDirOption
4445
*
4546
* It's recommended to run `./gradlew clean` first before running this script to minimize work.
4647
*/
47-
public class GradleProjectFlattenerCli : CliktCommand(help = DESCRIPTION) {
48+
public class GradleProjectFlattenerCli : CliktCommand() {
4849

4950
private companion object {
5051
const val DESCRIPTION =
@@ -60,6 +61,8 @@ public class GradleProjectFlattenerCli : CliktCommand(help = DESCRIPTION) {
6061
override fun create(): CliktCommand = GradleProjectFlattenerCli()
6162
}
6263

64+
override fun help(context: Context): String = DESCRIPTION
65+
6366
private val projectDir by projectDirOption()
6467

6568
private val settingsFile by

‎src/main/kotlin/slack/cli/gradle/GradleSettingsVerifierCli.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli.gradle
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.Context
1920
import com.github.ajalt.clikt.parameters.options.flag
2021
import com.github.ajalt.clikt.parameters.options.multiple
2122
import com.github.ajalt.clikt.parameters.options.option
@@ -39,7 +40,7 @@ import slack.cli.skipBuildAndCacheDirs
3940
import slack.cli.walkEachFile
4041

4142
/** A CLI that verifies a given settings file has only valid projects. */
42-
public class GradleSettingsVerifierCli : CliktCommand(help = DESCRIPTION) {
43+
public class GradleSettingsVerifierCli : CliktCommand() {
4344

4445
private companion object {
4546
const val DESCRIPTION = "A CLI that verifies a given settings file has only valid projects."
@@ -53,6 +54,8 @@ public class GradleSettingsVerifierCli : CliktCommand(help = DESCRIPTION) {
5354
override fun create(): CliktCommand = GradleSettingsVerifierCli()
5455
}
5556

57+
override fun help(context: Context): String = DESCRIPTION
58+
5659
private val projectDir by projectDirOption()
5760

5861
private val settingsFile by

‎src/main/kotlin/slack/cli/gradle/GradleTestFixturesMigratorCli.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli.gradle
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.Context
1920
import com.github.ajalt.clikt.parameters.arguments.argument
2021
import com.github.ajalt.clikt.parameters.arguments.multiple
2122
import com.github.ajalt.clikt.parameters.options.flag
@@ -54,7 +55,7 @@ import slack.cli.skipBuildAndCacheDirs
5455
import slack.cli.walkEachFile
5556

5657
/** @see DESCRIPTION */
57-
public class GradleTestFixturesMigratorCli : CliktCommand(help = DESCRIPTION) {
58+
public class GradleTestFixturesMigratorCli : CliktCommand() {
5859

5960
private companion object {
6061
const val DESCRIPTION =
@@ -73,6 +74,8 @@ public class GradleTestFixturesMigratorCli : CliktCommand(help = DESCRIPTION) {
7374
override fun create(): CliktCommand = GradleTestFixturesMigratorCli()
7475
}
7576

77+
override fun help(context: Context): String = DESCRIPTION
78+
7679
private val projectDir by projectDirOption()
7780

7881
private val dryRun by dryRunOption()

‎src/main/kotlin/slack/cli/sarif/ApplyBaselinesToSarifs.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli.sarif
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.Context
1920
import com.github.ajalt.clikt.parameters.options.flag
2021
import com.github.ajalt.clikt.parameters.options.option
2122
import com.github.ajalt.clikt.parameters.options.required
@@ -31,7 +32,7 @@ import kotlin.system.exitProcess
3132
import slack.cli.CommandFactory
3233

3334
/** A CLI that applies baselines data to a SARIF file. See the docs on [Mode] for more details. */
34-
public class ApplyBaselinesToSarifs : CliktCommand(help = DESCRIPTION) {
35+
public class ApplyBaselinesToSarifs : CliktCommand() {
3536

3637
@AutoService(CommandFactory::class)
3738
public class Factory : CommandFactory {
@@ -45,6 +46,8 @@ public class ApplyBaselinesToSarifs : CliktCommand(help = DESCRIPTION) {
4546
const val DESCRIPTION = "A CLI that applies baselines data to a SARIF file."
4647
}
4748

49+
override fun help(context: Context): String = DESCRIPTION
50+
4851
private val baseline by
4952
option("--baseline", "-b", help = "The baseline SARIF file to use.")
5053
.path(mustExist = true, canBeDir = false)

‎src/main/kotlin/slack/cli/sarif/MergeSarifReports.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package slack.cli.sarif
1717

1818
import com.github.ajalt.clikt.core.CliktCommand
19+
import com.github.ajalt.clikt.core.Context
1920
import com.github.ajalt.clikt.parameters.arguments.argument
2021
import com.github.ajalt.clikt.parameters.arguments.multiple
2122
import com.github.ajalt.clikt.parameters.options.flag
@@ -46,7 +47,8 @@ import slack.cli.projectDirOption
4647
import slack.cli.skipBuildAndCacheDirs
4748
import slack.cli.walkEachFile
4849

49-
public class MergeSarifReports : CliktCommand(help = DESCRIPTION) {
50+
@Suppress("TooManyFunctions")
51+
public class MergeSarifReports : CliktCommand() {
5052

5153
@AutoService(CommandFactory::class)
5254
public class Factory : CommandFactory {
@@ -56,6 +58,8 @@ public class MergeSarifReports : CliktCommand(help = DESCRIPTION) {
5658
override fun create(): CliktCommand = MergeSarifReports()
5759
}
5860

61+
override fun help(context: Context): String = DESCRIPTION
62+
5963
private val projectDir by projectDirOption()
6064
private val outputFile by option("--output-file").path().required()
6165
private val filePrefix by option("--file-prefix")

‎src/main/kotlin/slack/cli/shellsentry/ShellSentry.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package slack.cli.shellsentry
1717

18+
import com.github.ajalt.clikt.core.main
1819
import com.squareup.moshi.adapter
1920
import eu.jrie.jetbrains.kotlinshell.shell.shell
2021
import java.nio.file.Path
@@ -135,7 +136,7 @@ public data class ShellSentry(
135136

136137
public companion object {
137138
/** Creates a new instance with the given [argv] command line args as input. */
138-
public fun create(argv: Array<String>, echo: (String) -> Unit): ShellSentry {
139+
public fun create(argv: List<String>, echo: (String) -> Unit): ShellSentry {
139140
val cli = ShellSentryCli().apply { main(listOf("--parse-only") + argv) }
140141
return create(cli, echo)
141142
}

‎src/test/kotlin/slack/cli/shellsentry/ShellSentryCliTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package slack.cli.shellsentry
1717

18+
import com.github.ajalt.clikt.core.parse
1819
import com.google.common.truth.Truth.assertThat
1920
import org.junit.Rule
2021
import org.junit.Test

0 commit comments

Comments
 (0)