From 6d7fb91fb70567adc2832b2ea93e576311267bd6 Mon Sep 17 00:00:00 2001 From: AxelRay <110029405+axelray-dev@users.noreply.github.com> Date: Mon, 28 Sep 2026 11:12:26 +0800 Subject: [PATCH] fix(kotlin-misk): remove nonexistent models project --- .../resources/kotlin-misk/settings.gradle.kts.mustache | 3 +-- .../codegen/kotlin/misk/KotlinMiskServerCodegenTest.java | 7 ++++++- .../server/petstore/kotlin-misk-config/settings.gradle.kts | 3 +-- samples/server/petstore/kotlin-misk/settings.gradle.kts | 3 +-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache index c43b3eccdc6f..b58794c2daf4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache @@ -11,5 +11,4 @@ dependencyResolutionManagement { } } -include(":models") -rootProject.name = "{{artifactId}}" \ No newline at end of file +rootProject.name = "{{artifactId}}" diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java index f44a7f57de99..4b59d58488b0 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java @@ -17,6 +17,7 @@ import java.nio.file.Paths; import static org.openapitools.codegen.TestUtils.assertFileContains; +import static org.openapitools.codegen.TestUtils.assertFileNotContains; public class KotlinMiskServerCodegenTest { @@ -60,9 +61,13 @@ public void testBuildGradleKts() throws IOException { Path buildGradle = Paths.get(output + "/build.gradle.kts"); Assert.assertTrue(buildGradle.toFile().exists()); + + Path settingsGradle = Paths.get(output + "/settings.gradle.kts"); + Assert.assertTrue(settingsGradle.toFile().exists()); + assertFileNotContains(settingsGradle, "include(\":models\")"); // Verify build.gradle.kts content assertFileContains(buildGradle, "id(\"org.jetbrains.kotlin.jvm\")"); assertFileContains(buildGradle, "implementation(\"com.squareup.misk:misk:"); } -} \ No newline at end of file +} diff --git a/samples/server/petstore/kotlin-misk-config/settings.gradle.kts b/samples/server/petstore/kotlin-misk-config/settings.gradle.kts index ac3678f99c1e..b57f6a1f938c 100644 --- a/samples/server/petstore/kotlin-misk-config/settings.gradle.kts +++ b/samples/server/petstore/kotlin-misk-config/settings.gradle.kts @@ -11,5 +11,4 @@ dependencyResolutionManagement { } } -include(":models") -rootProject.name = "openapi-kotlin-misk-server" \ No newline at end of file +rootProject.name = "openapi-kotlin-misk-server" diff --git a/samples/server/petstore/kotlin-misk/settings.gradle.kts b/samples/server/petstore/kotlin-misk/settings.gradle.kts index ac3678f99c1e..b57f6a1f938c 100644 --- a/samples/server/petstore/kotlin-misk/settings.gradle.kts +++ b/samples/server/petstore/kotlin-misk/settings.gradle.kts @@ -11,5 +11,4 @@ dependencyResolutionManagement { } } -include(":models") -rootProject.name = "openapi-kotlin-misk-server" \ No newline at end of file +rootProject.name = "openapi-kotlin-misk-server"