Final touchups

slackhq · Nov 22, 2023 · d0b99f3 · d0b99f3
1 parent eb49850
commit d0b99f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/api/kotlin-cli-util.api b/api/kotlin-cli-util.api
@@ -37,6 +37,11 @@ public final class slack/cli/Toml {
 	public final fun parseVersion (Ljava/io/File;)Ljava/util/Map;
 }
 
+public final class slack/cli/gradle/GradleProjectFlattenerCli : com/github/ajalt/clikt/core/CliktCommand {
+	public fun <init> ()V
+	public fun run ()V
+}
+
 public final class slack/cli/lint/LintBaselineMergerCli : com/github/ajalt/clikt/core/CliktCommand {
 	public fun <init> ()V
 	public fun run ()V

diff --git a/...lack/cli/gradle/GradleProjectFlattener.kt → ...k/cli/gradle/GradleProjectFlattenerCli.kt b/...lack/cli/gradle/GradleProjectFlattener.kt → ...k/cli/gradle/GradleProjectFlattenerCli.kt
@@ -17,8 +17,8 @@ package slack.cli.gradle
 
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.default
-import com.github.ajalt.clikt.parameters.options.defaultLazy
 import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.path
 import java.io.File
 import kotlin.io.path.ExperimentalPathApi
@@ -44,7 +44,8 @@ import slack.cli.projectDirOption
 public class GradleProjectFlattenerCli :
   CliktCommand(
     help =
-      "A CLI that flattens all gradle projects in a given directory to be top level while preserving their original project paths."
+      "A CLI that flattens all gradle projects in a given directory to be top level while " +
+        "preserving their original project paths."
   ) {
 
   private val projectDir by projectDirOption()
@@ -54,10 +55,11 @@ public class GradleProjectFlattenerCli :
         "--settings-file",
         "-s",
         help =
-          "The settings.gradle file to use. Defaults to settings.gradle.kts in the current directory. Note this file _must_ only have a single, top-level `include()` call with vararg project args."
+          "The settings.gradle file to use. Note this file _must_ only have a single, top-level `include()` call " +
+            "with vararg project args."
       )
       .path(mustExist = true, canBeDir = false)
-      .defaultLazy { projectDir.resolve("settings.gradle.kts") }
+      .required()
 
   private val projectDelimiter: String by option().default("--")