diff --git a/apps/converter/build.gradle.kts b/apps/converter/build.gradle.kts index 0358d7d0..c1b94849 100644 --- a/apps/converter/build.gradle.kts +++ b/apps/converter/build.gradle.kts @@ -56,9 +56,9 @@ dependencies { implementation("com.github.vishna:watchservice-ktx:master-SNAPSHOT") implementation("com.github.pgreze:kotlin-process:1.4.1") + implementation(project(mapOf("path" to ":shared:eventi"))) implementation(project(mapOf("path" to ":shared:contract"))) implementation(project(mapOf("path" to ":shared:common"))) - implementation(project(mapOf("path" to ":shared:eventi"))) implementation(kotlin("stdlib-jdk8")) diff --git a/apps/coordinator/build.gradle.kts b/apps/coordinator/build.gradle.kts index 052316ee..a4caa61f 100644 --- a/apps/coordinator/build.gradle.kts +++ b/apps/coordinator/build.gradle.kts @@ -45,9 +45,9 @@ dependencies { //implementation(project(mapOf("path" to ":shared"))) + implementation(project(mapOf("path" to ":shared:eventi"))) implementation(project(mapOf("path" to ":shared:contract"))) implementation(project(mapOf("path" to ":shared:common"))) - implementation(project(mapOf("path" to ":shared:eventi"))) implementation("org.jetbrains.exposed:exposed-core:$exposedVersion") implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion") diff --git a/apps/processer/build.gradle.kts b/apps/processer/build.gradle.kts index 9a678fa8..aff053cc 100644 --- a/apps/processer/build.gradle.kts +++ b/apps/processer/build.gradle.kts @@ -49,9 +49,9 @@ dependencies { implementation("com.github.pgreze:kotlin-process:1.4.1") //implementation(project(mapOf("path" to ":shared"))) + implementation(project(mapOf("path" to ":shared:eventi"))) implementation(project(mapOf("path" to ":shared:contract"))) implementation(project(mapOf("path" to ":shared:common"))) - implementation(project(mapOf("path" to ":shared:eventi"))) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5a29a1f3..d9915fb5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,9 +10,9 @@ findProject(":apps:processer")?.name = "processer" findProject(":shared")?.name = "shared" +findProject(":shared:eventi")?.name = "eventi" findProject(":shared:contract")?.name = "contract" findProject(":shared:common")?.name = "common" -findProject(":shared:eventi")?.name = "eventi" include("apps") include("apps:ui") @@ -21,6 +21,6 @@ include("apps:converter") include("apps:processer") include("shared") +include("shared:eventi") include("shared:contract") include("shared:common") -include("shared:eventi") diff --git a/shared/common/build.gradle.kts b/shared/common/build.gradle.kts index 81d77712..4123c8cc 100644 --- a/shared/common/build.gradle.kts +++ b/shared/common/build.gradle.kts @@ -42,8 +42,8 @@ dependencies { implementation("org.apache.commons:commons-lang3:3.12.0") - implementation(project(mapOf("path" to ":shared:contract"))) implementation(project(mapOf("path" to ":shared:eventi"))) + implementation(project(mapOf("path" to ":shared:contract"))) testImplementation(platform("org.junit:junit-bom:5.9.1")) testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/shared/contract/build.gradle.kts b/shared/contract/build.gradle.kts index f3801ce5..4e5cf2f9 100644 --- a/shared/contract/build.gradle.kts +++ b/shared/contract/build.gradle.kts @@ -12,11 +12,11 @@ repositories { dependencies { - implementation(project(mapOf("path" to ":shared:eventi"))) implementation("com.google.code.gson:gson:2.8.9") implementation("io.github.microutils:kotlin-logging-jvm:2.0.11") implementation("org.springframework.boot:spring-boot-starter:2.7.0") + implementation(project(mapOf("path" to ":shared:eventi"))) testImplementation(platform("org.junit:junit-bom:5.9.1"))