commit 9ff6e5a57b13668c555b75488704b15abc052166
parent e136bbd78c6da2d5a8c0de9a248e03d539f96085
Author: Antoine A <>
Date: Tue, 28 Nov 2023 14:21:35 +0000
Disable minimization and remove unused dependencies
Diffstat:
4 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/bank/build.gradle b/bank/build.gradle
@@ -34,11 +34,10 @@ dependencies {
implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
implementation("io.ktor:ktor-server-status-pages:$ktor_version")
implementation("io.ktor:ktor-server-netty:$ktor_version")
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$json_version")
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
// UNIX domain sockets support (used to connect to PostgreSQL)
- implementation("com.kohlschutter.junixsocket:junixsocket-core:2.8.1")
+ implementation("com.kohlschutter.junixsocket:junixsocket-core:$junixsocket_version")
testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
@@ -53,7 +52,7 @@ application {
}
shadowJar {
- /*minimize { TODO enable again when we have more time to test it
+ /*minimize { //TODO enable again when we have more time to test it
// Kotlin serialization
exclude(dependency("io.ktor:ktor-serialization-kotlinx-json:.*"))
// Postgres driver
diff --git a/build.gradle b/build.gradle
@@ -22,11 +22,10 @@ allprojects {
ext {
set("kotlin_version", "1.9.20")
set("ktor_version", "2.3.6")
- set("netty_version", "4.1.100.Final")
set("clikt_version", "4.2.1")
- set("json_version", "1.6.1")
set("coroutines_version", "1.7.3")
set("postgres_version", "42.7.0")
+ set("junixsocket_version", "2.8.3")
}
repositories {
diff --git a/integration/build.gradle b/integration/build.gradle
@@ -13,31 +13,15 @@ compileTestKotlin.kotlinOptions.jvmTarget = "17"
sourceSets.test.java.srcDirs = ["test"]
dependencies {
- // Core language libraries
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+ testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
- implementation(project(":util"))
- implementation(project(":bank"))
- implementation(project(":nexus"))
+ testImplementation(project(":util"))
+ testImplementation(project(":bank"))
+ testImplementation(project(":nexus"))
- implementation("org.postgresql:postgresql:42.6.0")
- implementation("com.zaxxer:HikariCP:5.0.1")
- implementation("com.github.ajalt.clikt:clikt:4.2.1")
+ testImplementation("com.github.ajalt.clikt:clikt:$clikt_version")
- implementation("io.ktor:ktor-server-core:$ktor_version")
- implementation("io.ktor:ktor-server-call-logging:$ktor_version")
- implementation("io.ktor:ktor-server-cors:$ktor_version")
- implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
- implementation("io.ktor:ktor-server-status-pages:$ktor_version")
- implementation("io.ktor:ktor-server-netty:$ktor_version")
- implementation("io.ktor:ktor-server-test-host:$ktor_version")
- implementation("io.ktor:ktor-client-core:$ktor_version")
- implementation("io.ktor:ktor-client-cio:$ktor_version")
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
- implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
- //implementation("com.github.ajalt.clikt:clikt.testing:4.2.1")
+ testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+ testImplementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
-
- // UNIX domain sockets support (used to connect to PostgreSQL)
- implementation("com.kohlschutter.junixsocket:junixsocket-core:2.8.1")
}
\ No newline at end of file
diff --git a/nexus/build.gradle b/nexus/build.gradle
@@ -46,11 +46,10 @@ dependencies {
implementation("com.itextpdf:itext7-core:7.1.16")
// UNIX domain sockets support (used to connect to PostgreSQL)
- implementation("com.kohlschutter.junixsocket:junixsocket-core:2.8.1")
+ implementation("com.kohlschutter.junixsocket:junixsocket-core:$junixsocket_version")
// Serialization
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
- implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$json_version")
// Unit testing
testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")