Skip to content

Commit b63468f

Browse files
authored
clean up dependencies by using MN's catalog (#106)
1 parent b01aec5 commit b63468f

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

build.gradle.kts

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -51,44 +51,51 @@ micronaut {
5151
}
5252
}
5353

54-
val kotlinCoroutinesVersion = "1.10.2"
5554
val jooqPluginVersion: String by project
56-
val kotlinVersion: String by project
57-
val postgresVersion = "42.7.5"
5855
val simpleJavaMailVersion = "8.12.5"
5956

6057
dependencies {
61-
kapt("io.micronaut.openapi:micronaut-openapi")
62-
kapt("io.micronaut.security:micronaut-security-annotations")
63-
kapt("io.micronaut.validation:micronaut-validation-processor")
64-
runtimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin")
65-
runtimeOnly("org.yaml:snakeyaml")
66-
implementation("nu.studer:gradle-jooq-plugin:$jooqPluginVersion")
67-
implementation("jakarta.persistence:jakarta.persistence-api:3.2.0")
68-
implementation("jakarta.validation:jakarta.validation-api:3.0.2")
69-
implementation("ch.qos.logback:logback-classic")
70-
implementation("io.arrow-kt:arrow-core-data:0.12.1")
71-
implementation(mn.micronaut.flyway)
72-
runtimeOnly("org.flywaydb:flyway-database-postgresql")
73-
implementation(mn.micronaut.kotlin.extension.functions)
58+
59+
// Micronaut
60+
kapt(mn.micronaut.security.annotations)
61+
kapt(mn.micronaut.validation.processor)
62+
runtimeOnly(mn.jackson.module.kotlin)
63+
runtimeOnly(mn.snakeyaml)
64+
implementation(mn.micronaut.validation)
65+
implementation(mn.logback.classic)
66+
implementation(mn.micronaut.http.client)
7467
implementation(mn.micronaut.rxjava3)
7568
implementation(mn.micronaut.rxjava3.http.client)
69+
implementation(mn.micronaut.retry)
7670
implementation(mn.micronaut.security.jwt)
71+
72+
// OpenAPI
73+
kapt(mn.micronaut.openapi)
74+
implementation(mn.swagger.annotations)
75+
76+
// DB & jOOQ & Flyway
77+
runtimeOnly(mn.flyway.postgresql)
78+
implementation(mn.micronaut.flyway)
7779
implementation(mn.micronaut.jdbc.hikari)
7880
implementation(mn.micronaut.jooq)
79-
implementation(mn.micronaut.http.client)
80-
implementation(mn.micronaut.retry)
81-
implementation(mn.micronaut.validation)
82-
implementation("io.swagger.core.v3:swagger-annotations")
83-
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
84-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
85-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
86-
implementation("org.postgresql:postgresql:$postgresVersion")
81+
implementation(mn.postgresql)
82+
jooqGenerator(mn.postgresql)
83+
implementation("nu.studer:gradle-jooq-plugin:$jooqPluginVersion")
84+
85+
// Kotlin
86+
implementation(mn.kotlin.stdlib.jdk8)
87+
implementation(mn.kotlin.reflect)
88+
implementation(mn.kotlinx.coroutines.core)
89+
implementation(mn.micronaut.kotlin.extension.functions)
90+
implementation("io.arrow-kt:arrow-core-data:0.12.1")
91+
92+
// Mailer
8793
implementation("org.simplejavamail:batch-module:$simpleJavaMailVersion")
8894
implementation("org.simplejavamail:simple-java-mail:$simpleJavaMailVersion")
89-
jooqGenerator("org.postgresql:postgresql:$postgresVersion")
90-
testImplementation("io.mockk:mockk:1.14.0")
91-
testImplementation("org.testcontainers:postgresql:1.20.6")
95+
96+
// Testing
97+
testImplementation(mn.mockk)
98+
testImplementation(mn.testcontainers.postgres)
9299
}
93100

94101
application {

src/main/kotlin/com/kuvaszuptime/kuvasz/repositories/LatencyLogRepository.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ class LatencyLogRepository(jooqConfig: Configuration) : LatencyLogDao(jooqConfig
3434
.where(LATENCY_LOG.CREATED_AT.lessThan(limit))
3535
.execute()
3636

37+
// Well well, that's not so performant in case of a really huge dataset. Definitely something that should be
38+
// improved in the future.
3739
fun getLatencyPercentiles(monitorId: Int? = null): List<PercentileResult> =
3840
dsl
3941
.with("percentiles").`as`(

0 commit comments

Comments
 (0)