Remove deprecated Kobweb option

varabyte · Dec 10, 2024 · 20f337d · 20f337d
1 parent 6e60687
commit 20f337d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@ clikt = "5.0.1"
 freemarker = "2.3.31"
 jreleaser = "1.14.0"
 kobweb-cli = "0.9.18"
-kobweb-libs = "0.19.3-SNAPSHOT"
-kotter = "1.2.0-SNAPSHOT"
+kobweb-libs = "0.19.3"
+kotter = "1.2.0"
 kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
 okhttp = "4.12.0"

diff --git a/kobweb/src/main/kotlin/main.kt b/kobweb/src/main/kotlin/main.kt
@@ -1,4 +1,3 @@
-import com.github.ajalt.clikt.core.Abort
 import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.CoreCliktCommand
 import com.github.ajalt.clikt.core.ParameterHolder
@@ -16,8 +15,6 @@ import com.github.ajalt.clikt.parameters.options.convert
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
-import com.github.ajalt.clikt.parameters.options.validate
-import com.github.ajalt.clikt.parameters.transform.message
 import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.file
 import com.varabyte.kobweb.cli.common.DEFAULT_REPO
@@ -45,22 +42,12 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.io.File
 
-private const val KOBWEB_DEPRECATED_MESSAGE =
-    "NOTE: The option `kobweb` is deprecated and will be removed in a future version. Please use `fullstack` instead."
-
 private fun ParameterHolder.layout() = option(
     "-l", "--layout",
     help = "Specify the organizational layout of the site files."
-            + " " + KOBWEB_DEPRECATED_MESSAGE
 )
     .enum<SiteLayout>()
     .default(SiteLayout.FULLSTACK)
-    .validate {
-        @Suppress("DEPRECATION")
-        if (it == SiteLayout.KOBWEB) {
-            message(KOBWEB_DEPRECATED_MESSAGE)
-        }
-    }
 
 enum class TeleTypeMode {
     ENABLED,