From 52739ea0b42772e59724f671d5ddb7622a52489f Mon Sep 17 00:00:00 2001 From: Jan-Niclas Struewer <j.n.struewer@gmail.com> Date: Fri, 26 Jul 2024 13:44:47 +0200 Subject: [PATCH] build: added subprojects for model and adapter code. --- app/backend/build.gradle.kts | 4 +++- .../de/fraunhofer/iem/app/StartUpHandler.kt | 2 -- kpi-calculator/adapter/build.gradle.kts | 22 +++++++++++++++++++ kpi-calculator/core/build.gradle.kts | 2 +- kpi-calculator/core/src/main/kotlin/Main.kt | 5 ----- kpi-calculator/model/build.gradle.kts | 21 ++++++++++++++++++ kpi-calculator/settings.gradle.kts | 4 +++- 7 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 kpi-calculator/adapter/build.gradle.kts delete mode 100644 kpi-calculator/core/src/main/kotlin/Main.kt create mode 100644 kpi-calculator/model/build.gradle.kts diff --git a/app/backend/build.gradle.kts b/app/backend/build.gradle.kts index b4a26875..9061c718 100644 --- a/app/backend/build.gradle.kts +++ b/app/backend/build.gradle.kts @@ -37,7 +37,9 @@ repositories { val coroutineVersion = "1.9.0-RC" val ktorVersion = "2.3.12" dependencies { - implementation("de.fraunhofer.iem:core:0.0.2-SNAPSHOT") + implementation("de.fraunhofer.iem.kpiCalculator:core:0.0.2-SNAPSHOT") + implementation("de.fraunhofer.iem.kpiCalculator:adapter:0.0.2-SNAPSHOT") + implementation("de.fraunhofer.iem.kpiCalculator:model:0.0.2-SNAPSHOT") implementation("org.springframework.boot:spring-boot-starter-data-jpa:$springVersion") implementation("org.springframework.boot:spring-boot-starter-validation:$springVersion") implementation("org.springframework.boot:spring-boot-starter-security:$springVersion") diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/StartUpHandler.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/StartUpHandler.kt index 6224dff2..bec2903c 100644 --- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/StartUpHandler.kt +++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/StartUpHandler.kt @@ -6,7 +6,6 @@ import de.fraunhofer.iem.app.repository.dto.RepositoryConsentDto import de.fraunhofer.iem.app.repository.service.RepositoryService import de.fraunhofer.iem.app.tool.service.ToolService import de.fraunhofer.iem.app.toolRun.service.ToolRunService -import de.fraunhofer.iem.sayHello import kotlinx.coroutines.* import org.springframework.boot.context.event.ApplicationReadyEvent import org.springframework.context.event.EventListener @@ -24,7 +23,6 @@ class StartUpHandler( @EventListener(ApplicationReadyEvent::class) suspend fun queryProjects() { - sayHello() withContext(Dispatchers.IO) { logger.info("Creating tools in db") toolService.createAllTools() diff --git a/kpi-calculator/adapter/build.gradle.kts b/kpi-calculator/adapter/build.gradle.kts new file mode 100644 index 00000000..5d6e8933 --- /dev/null +++ b/kpi-calculator/adapter/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + kotlin("jvm") version "2.0.0" +} + +group = "de.fraunhofer.iem.kpiCalculator" +version = "0.0.2-SNAPSHOT" + +repositories { + mavenCentral() +} + +dependencies { + implementation("de.fraunhofer.iem.kpiCalculator:model:0.0.2-SNAPSHOT") + testImplementation(kotlin("test")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} diff --git a/kpi-calculator/core/build.gradle.kts b/kpi-calculator/core/build.gradle.kts index 92f04e9a..c89e559b 100644 --- a/kpi-calculator/core/build.gradle.kts +++ b/kpi-calculator/core/build.gradle.kts @@ -2,7 +2,7 @@ plugins { kotlin("jvm") version "2.0.0" } -group = "de.fraunhofer.iem" +group = "de.fraunhofer.iem.kpiCalculator" version = "0.0.2-SNAPSHOT" repositories { diff --git a/kpi-calculator/core/src/main/kotlin/Main.kt b/kpi-calculator/core/src/main/kotlin/Main.kt deleted file mode 100644 index 66492046..00000000 --- a/kpi-calculator/core/src/main/kotlin/Main.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.fraunhofer.iem - -fun sayHello() { - println("Hello World!") -} diff --git a/kpi-calculator/model/build.gradle.kts b/kpi-calculator/model/build.gradle.kts new file mode 100644 index 00000000..c89e559b --- /dev/null +++ b/kpi-calculator/model/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("jvm") version "2.0.0" +} + +group = "de.fraunhofer.iem.kpiCalculator" +version = "0.0.2-SNAPSHOT" + +repositories { + mavenCentral() +} + +dependencies { + testImplementation(kotlin("test")) +} + +tasks.test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} diff --git a/kpi-calculator/settings.gradle.kts b/kpi-calculator/settings.gradle.kts index ffa8c861..61035eae 100644 --- a/kpi-calculator/settings.gradle.kts +++ b/kpi-calculator/settings.gradle.kts @@ -1,3 +1,5 @@ rootProject.name = "kpi-calculator" -include("core") \ No newline at end of file +include("core") +include("model") +include("adapter") -- GitLab