Skip to content

Update Clikt to new major version #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReneeVandervelde merged 1 commit into from
Jan 18, 2026
Merged

Update Clikt to new major version #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
1 change: 1 addition & 0 deletions cli/src/main/kotlin/inkapplications/shade/cli/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 7 additions & 4 deletions cli/src/main/kotlin/inkapplications/shade/cli/ShadeCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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. "
)
Expand Down Expand Up @@ -66,6 +65,10 @@ abstract class ShadeCommand(
)
}

override fun help(context: Context): String {
return help
}

final override fun run() {
val result = runBlocking {
runCatching {
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/devices/DeviceOutput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

/**
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/events/EventsCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/groupedlights/GroupedLightsOutput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/lights/LightOutput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/scenes/SceneOutput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cli/src/main/kotlin/inkapplications/shade/cli/zones/ZoneOutput.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down