Update versions and test project generator

ktorio · Dec 12, 2024 · c37a0a4 · c37a0a4
1 parent 4198a37
commit c37a0a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/plugins/gradle.properties b/plugins/gradle.properties
@@ -10,5 +10,5 @@ prometheus=1.6.+
 kotlinx-browser=0.3
 
 # Determined by options during project creation
-ktor_version=3.0.1
-kotlin_version=2.0.21
+ktor_version=3.0.2
+kotlin_version=2.1.0
diff --git a/src/main/kotlin/io/ktor/plugins/registry/GenerateTestProject.kt b/src/main/kotlin/io/ktor/plugins/registry/GenerateTestProject.kt
@@ -15,6 +15,7 @@ import kotlinx.serialization.json.contentOrNull
 import kotlinx.serialization.json.jsonArray
 import kotlinx.serialization.json.jsonPrimitive
 import org.slf4j.LoggerFactory
+import kotlin.io.path.Path
 
 private const val GENERATE_URL = "https://start-ktor-io.labs.jb.gg/project/generate"
 private const val COMPARE_BRANCH = "main"
@@ -46,6 +47,7 @@ fun main(args: Array<String>) {
     logger.info("Creating project from plugins:\n${pluginIds.joinToString("\n") { " - $it" }}")
     val registryFiles = RegistryOutputFiles(argsMap["build-dir"]!!)
     val latestRelease = registryFiles.ktorReleases.last()
+    val versionProperties = Path("plugins").readVersionProperties()
 
     val generatorBackendUrl = argsMap["url"]!!
     val projectPath = argsMap["path"] ?: OUTPUT_DIR
@@ -57,6 +59,8 @@ fun main(args: Array<String>) {
             features = registryFiles.getAllRequiredPluginIds(latestRelease, pluginIds)
             featureOverrides = pluginIds.map { registryFiles.readManifest(latestRelease, it) }
             outputDir = projectPath
+            ktorVersion = versionProperties["ktor_version"]
+            kotlinVersion = versionProperties["kotlin_version"]
         }
     }
 

diff --git a/src/main/kotlin/io/ktor/plugins/registry/utils/ProjectGeneratorClient.kt b/src/main/kotlin/io/ktor/plugins/registry/utils/ProjectGeneratorClient.kt
@@ -26,7 +26,6 @@ private const val DEFAULT_PROJECT_WEBSITE = "ktor.io"
 private const val DEFAULT_BUILD_SYSTEM = "GRADLE_KTS"
 private const val DEFAULT_ENGINE = "NETTY"
 private const val DEFAULT_OUTPUT_DIR = "test-project"
-private const val DEFAULT_KOTLIN_VERSION = "1.9.23" // TODO get from gradle
 private const val DEFAULT_CONFIGURATION_OPTION = "HOCON"
 
 /**
@@ -40,9 +39,13 @@ class ProjectGeneratorClient(
 
     @OptIn(ExperimentalSerializationApi::class, ExperimentalPathApi::class)
     suspend fun generate(params: ProjectGeneratorRequestBuilder.() -> Unit) {
+
         ProjectGeneratorRequestBuilder().run {
             params()
 
+            require(kotlinVersion != null) { "Kotlin version must be specified" }
+            require(ktorVersion != null) { "Ktor version must be specified" }
+
             val response = httpClient.post(url) {
                 contentType(ContentType.Application.Json)
                 accept(ContentType.Application.Zip)
@@ -55,6 +58,9 @@ class ProjectGeneratorClient(
                         put("ktor_version", ktorVersion)
                         put("kotlin_version", kotlinVersion)
                         put("build_system", buildSystem)
+                        putJsonObject("build_system_args") {
+                            put("version_catalog", true)
+                        }
                         put("engine", engine)
                     }
                     put("configurationOption", configurationOption)
@@ -106,7 +112,7 @@ class ProjectGeneratorRequestBuilder {
     var engine: String = DEFAULT_ENGINE
     var outputDir: String = DEFAULT_OUTPUT_DIR
     var ktorVersion: String? = null
-    var kotlinVersion: String = DEFAULT_KOTLIN_VERSION
+    var kotlinVersion: String? = null
     var features: List<String> = emptyList()
     var featureOverrides: List<JsonObject> = emptyList()
     var configurationOption: String = DEFAULT_CONFIGURATION_OPTION