From a602fe25b9744280cb8b3572cc066f95b2d760c1 Mon Sep 17 00:00:00 2001 From: doji Date: Mon, 16 Sep 2024 16:32:59 +0900 Subject: [PATCH 1/7] add source set & change directory name --- bootstrap/api/build.gradle.kts | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index fe1c3dd..9b1c400 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { implementation(project(":application")) implementation(project(":infrastructure:persistence")) implementation(project(":infrastructure:sms")) + implementation(project(":bootstrap:api")) implementation(libs.spring.boot.starter.web) @@ -19,18 +20,29 @@ dependencies { developmentOnly(libs.spring.boot.docker.compose) } +val openApiGeneratePath = "${layout.buildDirectory.get()}/generated" + openApiGenerate { generatorName.set("kotlin-spring") inputSpec.set("$rootDir/openapi/openapi.yaml") - outputDir.set("${layout.buildDirectory.get()}/generated") - apiPackage.set("com.sc.weave2.oas.api") - modelPackage.set("com.sc.weave2.oas.model") - configOptions.set(mapOf( - "interfaceOnly" to "true", - "useTags" to "true" - )) + outputDir.set(openApiGeneratePath) + apiPackage.set("com.threedays.oas.api") + modelPackage.set("com.threedays.oas.model") + configOptions.set( + mapOf( + "interfaceOnly" to "true", + "useTags" to "true", + "gradleBuildFile" to "true", + ) + ) } tasks.named("compileKotlin") { dependsOn("openApiGenerate") } + +sourceSets { + main { + kotlin.srcDir("$openApiGeneratePath/src/main/kotlin") + } +} From c4788899ef40c7ac98b9fb3df9ee8d5874a3790e Mon Sep 17 00:00:00 2001 From: doji Date: Mon, 16 Sep 2024 16:41:14 +0900 Subject: [PATCH 2/7] remove unnecessary line --- bootstrap/api/build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index 9b1c400..aadee44 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { implementation(project(":application")) implementation(project(":infrastructure:persistence")) implementation(project(":infrastructure:sms")) - implementation(project(":bootstrap:api")) implementation(libs.spring.boot.starter.web) @@ -32,7 +31,6 @@ openApiGenerate { mapOf( "interfaceOnly" to "true", "useTags" to "true", - "gradleBuildFile" to "true", ) ) } From 401224d803f30c5ebe79698aaa5ce3b1f060c844 Mon Sep 17 00:00:00 2001 From: doji Date: Mon, 16 Sep 2024 17:45:21 +0900 Subject: [PATCH 3/7] temp update gradle kts --- bootstrap/api/build.gradle.kts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index aadee44..697ee4a 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -6,6 +6,12 @@ plugins { dependencies { apply(plugin = rootProject.libs.plugins.openapi.generator.get().pluginId) + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0") + implementation("org.openapitools:jackson-databind-nullable:0.2.6") + implementation("io.swagger.core.v3:swagger-annotations:2.2.8") + implementation("jakarta.validation:jakarta.validation-api:3.0.2") + implementation("jakarta.annotation:jakarta.annotation-api:2.1.1") + implementation(project(":support:common")) implementation(project(":domain")) @@ -31,11 +37,12 @@ openApiGenerate { mapOf( "interfaceOnly" to "true", "useTags" to "true", + "useSpringBoot3" to "true", // SpringBoot 3, Jakarta 의존성 사용 ) ) } -tasks.named("compileKotlin") { +tasks.withType { dependsOn("openApiGenerate") } @@ -44,3 +51,4 @@ sourceSets { kotlin.srcDir("$openApiGeneratePath/src/main/kotlin") } } + From d614933fc5ade5d8463eedc19531a823a2f6c414 Mon Sep 17 00:00:00 2001 From: doji Date: Mon, 16 Sep 2024 17:50:47 +0900 Subject: [PATCH 4/7] add submoudle recursive --- .github/workflows/test_analyze.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_analyze.yaml b/.github/workflows/test_analyze.yaml index 5ec297f..78e8bea 100644 --- a/.github/workflows/test_analyze.yaml +++ b/.github/workflows/test_analyze.yaml @@ -12,6 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + submodules: 'recursive' fetch-depth: 0 - name: Set up JDK 21 uses: actions/setup-java@v4 From ecb7ff113f1077c0b1722a6a3ede57b6480a11b5 Mon Sep 17 00:00:00 2001 From: doji Date: Mon, 16 Sep 2024 18:04:43 +0900 Subject: [PATCH 5/7] refactor library version --- bootstrap/api/build.gradle.kts | 8 +++----- gradle/libs.versions.toml | 3 +++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index 697ee4a..7e9f4d5 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -6,11 +6,9 @@ plugins { dependencies { apply(plugin = rootProject.libs.plugins.openapi.generator.get().pluginId) - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0") - implementation("org.openapitools:jackson-databind-nullable:0.2.6") - implementation("io.swagger.core.v3:swagger-annotations:2.2.8") - implementation("jakarta.validation:jakarta.validation-api:3.0.2") - implementation("jakarta.annotation:jakarta.annotation-api:2.1.1") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${libs.versions.springdoc.openapi.get()}") + implementation("io.swagger.core.v3:swagger-annotations:${libs.versions.swagger.annotations.get()}") + implementation("org.springframework.boot:spring-boot-starter-validation") implementation(project(":support:common")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a706e4..8cc70d2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,9 @@ springdoc-openapi = "2.6.0" # sms-client module library versions cool-sms = "4.3.0" +# swagger core libraray version +swagger-annotations = "2.2.8" + [libraries] # subprojects libraries kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging-jvm", version.ref = "kotlin-logging" } From df9bb5617c85148d3ac6808e8945adf6776bda70 Mon Sep 17 00:00:00 2001 From: San Kim Date: Mon, 16 Sep 2024 19:28:31 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20library=20v?= =?UTF-8?q?ersion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstrap/api/build.gradle.kts | 9 +++------ gradle/libs.versions.toml | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index 7e9f4d5..88f88b7 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -6,18 +6,16 @@ plugins { dependencies { apply(plugin = rootProject.libs.plugins.openapi.generator.get().pluginId) - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${libs.versions.springdoc.openapi.get()}") - implementation("io.swagger.core.v3:swagger-annotations:${libs.versions.swagger.annotations.get()}") - implementation("org.springframework.boot:spring-boot-starter-validation") - implementation(project(":support:common")) - implementation(project(":domain")) implementation(project(":application")) implementation(project(":infrastructure:persistence")) implementation(project(":infrastructure:sms")) implementation(libs.spring.boot.starter.web) + implementation(libs.springdoc.openapi.webmvc.ui) + implementation(libs.swagger.annotations) + implementation(libs.spring.boot.starter.validation) developmentOnly(libs.spring.boot.devtools) developmentOnly(libs.spring.boot.docker.compose) @@ -49,4 +47,3 @@ sourceSets { kotlin.srcDir("$openApiGeneratePath/src/main/kotlin") } } - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8cc70d2..6d060c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,6 +78,9 @@ cool-sms = { group = "net.nurigo", name = "sdk", version.ref = "cool-sms" } spring-boot-starter-web = { group = "org.springframework.boot", name = "spring-boot-starter-web", version.ref = "spring-boot" } spring-boot-devtools = { group = "org.springframework.boot", name = "spring-boot-devtools", version.ref = "spring-boot" } spring-boot-docker-compose = { group = "org.springframework.boot", name = "spring-boot-docker-compose", version.ref = "spring-boot" } +springdoc-openapi-webmvc-ui = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc-openapi" } +swagger-annotations = { group = "io.swagger.core.v3", name = "swagger-annotations", version.ref = "swagger-annotations" } +spring-boot-starter-validation = { group = "org.springframework.boot", name = "spring-boot-starter-validation", version.ref = "spring-boot" } [plugins] From 5c16052e1f116c5c97b7745bb1e7c7f10ca212f8 Mon Sep 17 00:00:00 2001 From: San Kim Date: Mon, 16 Sep 2024 19:29:16 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20library=20v?= =?UTF-8?q?ersion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstrap/api/build.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap/api/build.gradle.kts b/bootstrap/api/build.gradle.kts index 88f88b7..f8866c6 100644 --- a/bootstrap/api/build.gradle.kts +++ b/bootstrap/api/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id(libs.plugins.openapi.generator.get().pluginId) version libs.plugins.openapi.generator.get().version.toString() } @@ -33,12 +35,12 @@ openApiGenerate { mapOf( "interfaceOnly" to "true", "useTags" to "true", - "useSpringBoot3" to "true", // SpringBoot 3, Jakarta 의존성 사용 + "useSpringBoot3" to "true", ) ) } -tasks.withType { +tasks.withType { dependsOn("openApiGenerate") }