Skip to content

Commit

Permalink
Merge pull request #97 from nprzy/update-dependencies
Browse files Browse the repository at this point in the history
Move dependencies with common version numbers to Gradle Version Catalog
  • Loading branch information
dvankley authored Jul 18, 2024
2 parents e452a04 + 0ccb29b commit cfe4d2f
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 24 deletions.
27 changes: 8 additions & 19 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ val jacksonVersion: String by project
plugins {
id("org.springframework.boot") version "3.3.1"
id("io.spring.dependency-management") version "1.1.5"
kotlin("jvm") version "1.9.24"
kotlin("plugin.spring") version "1.9.24"
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

group = "net.djvk"
Expand All @@ -22,28 +22,17 @@ repositories {
}

dependencies {
implementation(libs.bundles.openapi)
implementation(libs.ktor.cio)
implementation(libs.ktor.logging)
implementation("org.springframework.boot:spring-boot-starter")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
implementation("org.jetbrains.exposed:exposed-dao:$exposedVersion")
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
implementation("org.xerial:sqlite-jdbc:3.46.0.0")
implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
implementation("io.ktor:ktor-serialization-jackson:$ktorVersion")
implementation("io.ktor:ktor-client-core-jvm:2.3.12")
implementation("io.ktor:ktor-client-cio-jvm:2.3.12")
implementation("io.ktor:ktor-client-logging-jvm:2.3.12")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation("org.semver4j:semver4j:5.3.0")
testImplementation(libs.kotlin.test)
testImplementation(libs.ktor.mock)
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")
testImplementation("org.assertj:assertj-core:3.26.0")
testImplementation("io.ktor:ktor-client-mock-jvm:2.3.12")
}

tasks.withType<KotlinCompile> {
Expand Down
5 changes: 0 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
kotlinVersion=1.7.10
kotlinCoroutinesVersion=1.6.3
exposedVersion=0.39.2
ktorVersion=2.1.1
jacksonVersion=2.13.4
33 changes: 33 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[versions]
kotlin = "1.9.24"
ktor = "2.3.12"
jackson = "2.17.0"

[libraries]
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-contentnegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
ktor-jackson-client = { module = "io.ktor:ktor-client-jackson", version.ref = "ktor" }
ktor-jackson-serialization = { module = "io.ktor:ktor-serialization-jackson", version.ref = "ktor" }
ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }

[bundles]
# Dependencies required by the generated OpenAPI clients.
openapi = [
"kotlin-reflect",
"jackson-kotlin",
"jackson-jsr310",
"ktor-core",
"ktor-contentnegotiation",
"ktor-jackson-client",
"ktor-jackson-serialization",
]

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }

0 comments on commit cfe4d2f

Please sign in to comment.