Merge pull request #156 from JetBrains/duplicate-dependencies

Remove duplicated ktor dependencies
JetBrains · Nov 14, 2024 · d05b776 · d05b776
2 parents 9e395d3 + b60428f
commit d05b776
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -17,9 +17,9 @@ dependencies {
     implementation(project(":shared"))
     implementation(libs.ktor.server.netty)
     implementation(libs.ktor.server.auth)
-    implementation(libs.ktor.ktor.serialization.kotlinx.json)
-    implementation(libs.ktor.ktor.client.cio)
-    implementation(libs.ktor.ktor.client.content.negotiation)
+    implementation(libs.ktor.serialization.kotlinx.json)
+    implementation(libs.ktor.client.cio)
+    implementation(libs.ktor.client.content.negotiation)
     implementation(libs.ktor.server.status.pages)
     implementation(libs.ktor.server.default.headers)
     implementation(libs.ktor.server.cors)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ image-loader = "1.9.0"
 junit = "4.13.2"
 kotlinx-datetime = "0.6.1"
 ktor = "3.0.0"
-android-svg="1.4"
+android-svg = "1.4"
 logbackClassic = "1.5.6"
 markdown = "0.26.0"
 postgresql = "42.7.3"
@@ -67,23 +67,20 @@ ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "kto
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-utils = { module = "io.ktor:ktor-utils", version.ref = "ktor" }
-ktor-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref="ktor" }
-ktor-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref="ktor" }
-ktor-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref="ktor" }
-ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref="ktor" }
-ktor-server-config-yaml = { module = "io.ktor:ktor-server-config-yaml", version.ref="ktor" }
-ktor-server-auto-head-response = { module = "io.ktor:ktor-server-auto-head-response", version.ref="ktor" }
-ktor-server-compression = { module = "io.ktor:ktor-server-compression", version.ref="ktor" }
-ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref="ktor" }
-ktor-server-conditional-headers = { module = "io.ktor:ktor-server-conditional-headers", version.ref="ktor" }
-ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref="ktor" }
-ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref="ktor" }
-ktor-server-default-headers = { module = "io.ktor:ktor-server-default-headers", version.ref="ktor" }
-ktor-server-forwarded-header = { module = "io.ktor:ktor-server-forwarded-header", version.ref="ktor" }
-ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref="ktor" }
-ktor-server-partial-content = { module = "io.ktor:ktor-server-partial-content", version.ref="ktor" }
-ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref="ktor" }
-ktor-server-swagger = { module = "io.ktor:ktor-server-swagger", version.ref="ktor" }
+ktor-server-auth = { module = "io.ktor:ktor-server-auth", version.ref = "ktor" }
+ktor-server-config-yaml = { module = "io.ktor:ktor-server-config-yaml", version.ref = "ktor" }
+ktor-server-auto-head-response = { module = "io.ktor:ktor-server-auto-head-response", version.ref = "ktor" }
+ktor-server-compression = { module = "io.ktor:ktor-server-compression", version.ref = "ktor" }
+ktor-server-call-logging = { module = "io.ktor:ktor-server-call-logging", version.ref = "ktor" }
+ktor-server-conditional-headers = { module = "io.ktor:ktor-server-conditional-headers", version.ref = "ktor" }
+ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
+ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktor" }
+ktor-server-default-headers = { module = "io.ktor:ktor-server-default-headers", version.ref = "ktor" }
+ktor-server-forwarded-header = { module = "io.ktor:ktor-server-forwarded-header", version.ref = "ktor" }
+ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
+ktor-server-partial-content = { module = "io.ktor:ktor-server-partial-content", version.ref = "ktor" }
+ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
+ktor-server-swagger = { module = "io.ktor:ktor-server-swagger", version.ref = "ktor" }
 
 # utility
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }