Skip to content

Commit

Permalink
Merge pull request #159 from navikt/pending-updates-2025-01-12T1006
Browse files Browse the repository at this point in the history
Pending updates 2025 01 12 t1006
  • Loading branch information
Dependency Admin committed Jan 14, 2025
1 parent f65d684 commit 310f009
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 20 deletions.
43 changes: 25 additions & 18 deletions buildSrc/src/main/kotlin/default/dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interface DependencyGroup {

interface FlywayDefaults: DependencyGroup {
override val groupId get() = "org.flywaydb"
override val version get() = "11.0.0"
override val version get() = "11.1.1"

val pluginId get() = "org.flywaydb.flyway"
val core get() = dependency("flyway-core")
Expand All @@ -31,21 +31,12 @@ interface HikariDefaults: DependencyGroup {
}

interface JacksonDatatypeDefaults: DependencyGroup {
override val version get() = "2.18.1"
override val version get() = "2.18.2"

val datatypeJsr310 get() = dependency("jackson-datatype-jsr310", groupId = "com.fasterxml.jackson.datatype")
val moduleKotlin get() = dependency("jackson-module-kotlin", groupId = "com.fasterxml.jackson.module")
}

interface JunitDefaults: DependencyGroup {
override val groupId get() = "org.junit.jupiter"
override val version get() = "5.11.3"

val api get() = dependency("junit-jupiter-api")
val engine get() = dependency("junit-jupiter-engine")
val params get() = dependency("junit-jupiter-params")
}

interface JjwtDefaults: DependencyGroup {
override val groupId get() = "io.jsonwebtoken"
override val version get() = "0.12.6"
Expand All @@ -56,6 +47,22 @@ interface JjwtDefaults: DependencyGroup {
val orgjson get() = dependency("jjwt-orgjson")
}

interface JunitJupiterDefaults: DependencyGroup {
override val groupId get() = "org.junit.jupiter"
override val version get() = "5.11.4"

val api get() = dependency("junit-jupiter-api")
val engine get() = dependency("junit-jupiter-engine")
val params get() = dependency("junit-jupiter-params")
}

interface JunitPlatformDefaults: DependencyGroup {
override val groupId get() = "org.junit.platform"
override val version get() = "1.11.4"

val launcher get() = dependency("junit-platform-launcher")
}

interface KafkaDefaults: DependencyGroup {
override val groupId get() = "org.apache.kafka"
override val version get() = "3.9.0"
Expand Down Expand Up @@ -83,33 +90,33 @@ interface KotestDefaults: DependencyGroup {

interface KotlinDefaults: DependencyGroup {
override val groupId get() = "org.jetbrains.kotlin"
override val version get() = "2.0.21"
override val version get() = "2.1.0"

val reflect get() = dependency("kotlin-reflect")
}

interface KotlinLoggingDefaults: DependencyGroup {
override val groupId get() = "io.github.oshai"
override val version get() = "7.0.0"
override val version get() = "7.0.3"

val logging get() = dependency("kotlin-logging")
}

interface KotlinxDefaults: DependencyGroup {
override val groupId get() = "org.jetbrains.kotlinx"

val coroutines get() = dependency("kotlinx-coroutines-core", version = "1.9.0")
val coroutines get() = dependency("kotlinx-coroutines-core", version = "1.10.1")
}

interface KotliQueryDefaults: DependencyGroup {
override val groupId get() = "com.github.seratch"
override val version get() = "1.9.0"
override val version get() = "1.9.1"

val kotliquery get() = dependency("kotliquery")
}

object KtorDefaults {
val version get() = "3.0.1"
val version get() = "3.0.3"
val groupId get() = "io.ktor"

interface ServerDefaults: DependencyGroup {
Expand Down Expand Up @@ -163,14 +170,14 @@ interface LogstashDefaults: DependencyGroup {

interface MicrometerDefaults: DependencyGroup {
override val groupId get() = "io.micrometer"
override val version get() = "1.14.1"
override val version get() = "1.14.2"

val registryPrometheus get() = dependency("micrometer-registry-prometheus")
}

interface MockkDefaults: DependencyGroup {
override val groupId get() = "io.mockk"
override val version get() = "1.13.13"
override val version get() = "1.13.16"

val mockk get() = dependency("mockk")
}
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/groups.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import default.*
object Flyway: FlywayDefaults
object Hikari: HikariDefaults
object JacksonDatatype: JacksonDatatypeDefaults
object Junit: JunitDefaults
object JunitJupiter: JunitJupiterDefaults
object JunitPlatform: JunitPlatformDefaults
object Jjwt: JjwtDefaults
object Kafka: KafkaDefaults
object Kluent: KluentDefaults
Expand All @@ -25,7 +26,6 @@ object Micrometer: MicrometerDefaults
object Mockk: MockkDefaults
object Postgresql: PostgresqlDefaults
object Prometheus: PrometheusDefaults
object Shadow: ShadowDefaults
object TestContainers: TestContainersDefaults
object TmsCommonLib: TmsCommonLibDefaults
object TmsKafkaTools: TmsKafkaToolsDefaults
Expand Down

0 comments on commit 310f009

Please sign in to comment.