From a4add8adbc8eeb7d4460cbe3d6f5a7fb2f71928f Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Sun, 7 May 2023 18:00:44 +0200 Subject: [PATCH] Update dependencies --- app/build.gradle.kts | 10 +++++----- app/src/Prompt.kt | 3 ++- app/src/commands/GenerateCommand.kt | 7 +++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c50302f..23cee5e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,11 +8,11 @@ plugins { version = "0.0.1-SNAPSHOT" dependencies { - implementation("org.slf4j:slf4j-api:2.0.0-alpha1") - runtimeOnly("org.slf4j:slf4j-simple:2.0.0-alpha1") - implementation("io.pebbletemplates:pebble:3.1.5") - implementation("com.github.ajalt.clikt:clikt:3.1.0") - implementation("org.graalvm.js:js:21.0.0.2") + implementation("org.slf4j:slf4j-api:2.0.7") + runtimeOnly("org.slf4j:slf4j-simple:2.0.7") + implementation("io.pebbletemplates:pebble:3.2.1") + implementation("com.github.ajalt.clikt:clikt:3.5.2") + implementation("org.graalvm.js:js:22.3.2") } application { diff --git a/app/src/Prompt.kt b/app/src/Prompt.kt index 6eab1d3..29085ce 100644 --- a/app/src/Prompt.kt +++ b/app/src/Prompt.kt @@ -5,6 +5,7 @@ import com.github.ajalt.clikt.output.CliktConsole import com.github.ajalt.clikt.output.TermUi import com.github.ajalt.clikt.output.defaultCliktConsole +@Suppress("DEPRECATION") // TODO: later.. class Prompt(private val console: CliktConsole = defaultCliktConsole()) { fun string(text: String, default: String?): String = TermUi.prompt( @@ -26,7 +27,7 @@ class Prompt(private val console: CliktConsole = defaultCliktConsole()) { showDefault = false, console = console ) { - when (it.toLowerCase()) { + when (it.lowercase()) { "y" -> true "n" -> false else -> throw UsageError("Can only be [y/n]") diff --git a/app/src/commands/GenerateCommand.kt b/app/src/commands/GenerateCommand.kt index 2eda4de..6a889cc 100644 --- a/app/src/commands/GenerateCommand.kt +++ b/app/src/commands/GenerateCommand.kt @@ -2,14 +2,13 @@ package scaffold.commands import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.ProgramResult -import com.github.ajalt.clikt.core.UsageError import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.options.convert import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.options.required -import com.mitchellbosecke.pebble.PebbleEngine -import com.mitchellbosecke.pebble.loader.FileLoader -import com.mitchellbosecke.pebble.template.PebbleTemplate +import io.pebbletemplates.pebble.PebbleEngine +import io.pebbletemplates.pebble.loader.FileLoader +import io.pebbletemplates.pebble.template.PebbleTemplate import scaffold.Generator import scaffold.Generators import scaffold.Prompt