From cb2e60e7f6bc85449c417c9951878795dc534e77 Mon Sep 17 00:00:00 2001
From: Renee Vandervelde <Renee@ReneeVandervelde.com>
Date: Sun, 18 Jan 2026 14:29:30 -0600
Subject: [PATCH] Update Clikt to new major version

---
 cli/build.gradle.kts                                  |  2 +-
 cli/src/main/kotlin/inkapplications/shade/cli/Main.kt |  1 +
 .../kotlin/inkapplications/shade/cli/ShadeCommand.kt  | 11 +++++++----
 .../inkapplications/shade/cli/devices/DeviceOutput.kt |  1 -
 .../inkapplications/shade/cli/events/EventsCommand.kt |  1 -
 .../shade/cli/groupedlights/GroupedLightsOutput.kt    |  1 -
 .../inkapplications/shade/cli/lights/LightOutput.kt   |  1 -
 .../inkapplications/shade/cli/scenes/SceneOutput.kt   |  1 -
 .../inkapplications/shade/cli/zones/ZoneOutput.kt     |  1 -
 9 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index be2fd7c1..ea2d8523 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -10,7 +10,7 @@ application {
 
 dependencies {
     implementation(libs.coroutines.core)
-    implementation("com.github.ajalt.clikt:clikt:4.4.0")
+    implementation("com.github.ajalt.clikt:clikt:5.0.3")
     implementation("org.slf4j:slf4j-nop:2.0.16")
     implementation(projects.core)
 }
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt b/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt
index bc2188d5..f8dee594 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/Main.kt
@@ -1,6 +1,7 @@
 package inkapplications.shade.cli
 
 import com.github.ajalt.clikt.core.NoOpCliktCommand
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.core.subcommands
 import inkapplications.shade.cli.buttons.*
 import inkapplications.shade.cli.connection.AuthorizeCommand
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/ShadeCommand.kt b/cli/src/main/kotlin/inkapplications/shade/cli/ShadeCommand.kt
index 0250bc06..30aabe23 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/ShadeCommand.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/ShadeCommand.kt
@@ -1,6 +1,7 @@
 package inkapplications.shade.cli
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.ProgramResult
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
@@ -12,11 +13,9 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.runBlocking
 
 abstract class ShadeCommand(
-    help: String,
+    private val help: String,
     protected val fileProperties: HueConfigurationContainer = PropertiesFileConfiguration(),
-): CliktCommand(
-    help = help,
-), HueConfigurationContainer by fileProperties {
+): CliktCommand(), HueConfigurationContainer by fileProperties {
     private val host by option(
         help = "Hostname of the Hue bridge. "
     )
@@ -66,6 +65,10 @@ abstract class ShadeCommand(
         )
     }
 
+    override fun help(context: Context): String {
+        return help
+    }
+
     final override fun run() {
         val result = runBlocking {
             runCatching {
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/devices/DeviceOutput.kt b/cli/src/main/kotlin/inkapplications/shade/cli/devices/DeviceOutput.kt
index e41947b4..08c3a4d6 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/devices/DeviceOutput.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/devices/DeviceOutput.kt
@@ -1,7 +1,6 @@
 package inkapplications.shade.cli.devices
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.devices.structures.Device
 
 /**
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/events/EventsCommand.kt b/cli/src/main/kotlin/inkapplications/shade/cli/events/EventsCommand.kt
index dfdb3328..16c19997 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/events/EventsCommand.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/events/EventsCommand.kt
@@ -1,6 +1,5 @@
 package inkapplications.shade.cli.events
 
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.cli.AuthorizedShadeCommand
 import inkapplications.shade.core.events
 import inkapplications.shade.groupedlights.events.GroupedLightEvent
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/groupedlights/GroupedLightsOutput.kt b/cli/src/main/kotlin/inkapplications/shade/cli/groupedlights/GroupedLightsOutput.kt
index 11cea407..c036fa61 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/groupedlights/GroupedLightsOutput.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/groupedlights/GroupedLightsOutput.kt
@@ -1,7 +1,6 @@
 package inkapplications.shade.cli.groupedlights
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.groupedlights.structures.GroupedLight
 
 fun CliktCommand.echoGroup(group: GroupedLight) {
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/lights/LightOutput.kt b/cli/src/main/kotlin/inkapplications/shade/cli/lights/LightOutput.kt
index fb7b85db..42a8ff75 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/lights/LightOutput.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/lights/LightOutput.kt
@@ -1,7 +1,6 @@
 package inkapplications.shade.cli.lights
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.lights.structures.Light
 import inkapplications.spondee.scalar.toWholePercentage
 import inkapplications.spondee.structure.format
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/scenes/SceneOutput.kt b/cli/src/main/kotlin/inkapplications/shade/cli/scenes/SceneOutput.kt
index 31bbb77a..657fd786 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/scenes/SceneOutput.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/scenes/SceneOutput.kt
@@ -1,7 +1,6 @@
 package inkapplications.shade.cli.scenes
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.scenes.structures.Scene
 import inkapplications.spondee.scalar.toWholePercentage
 import inkapplications.spondee.structure.format
diff --git a/cli/src/main/kotlin/inkapplications/shade/cli/zones/ZoneOutput.kt b/cli/src/main/kotlin/inkapplications/shade/cli/zones/ZoneOutput.kt
index f57bf3f1..d82922ac 100644
--- a/cli/src/main/kotlin/inkapplications/shade/cli/zones/ZoneOutput.kt
+++ b/cli/src/main/kotlin/inkapplications/shade/cli/zones/ZoneOutput.kt
@@ -1,7 +1,6 @@
 package inkapplications.shade.cli.zones
 
 import com.github.ajalt.clikt.core.CliktCommand
-import com.github.ajalt.clikt.output.TermUi
 import inkapplications.shade.zones.structures.Zone
 
 fun CliktCommand.echoZone(zone: Zone) {