From 0b092b352dc29ce69f6f126eb7857a1243a6ef62 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 23 Feb 2021 11:46:06 +0100 Subject: Extract testing conventions from Kotlin conventions This change extracts the configuration for test from the Kotlin library conventions. --- simulator/opendc-harness/build.gradle.kts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'simulator/opendc-harness/build.gradle.kts') diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts index 359d2384..fd692237 100644 --- a/simulator/opendc-harness/build.gradle.kts +++ b/simulator/opendc-harness/build.gradle.kts @@ -24,24 +24,22 @@ description = "Harness for defining repeatable experiments using OpenDC" /* Build configuration */ plugins { - `kotlin-library-convention` + `kotlin-library-conventions` + `testing-conventions` } dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Library.KOTLINX_COROUTINES}") - api("org.junit.platform:junit-platform-commons:${Library.JUNIT_PLATFORM}") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.KOTLINX_COROUTINES}") + api("org.junit.platform:junit-platform-commons:${Versions.JUNIT_PLATFORM}") implementation("io.github.classgraph:classgraph:4.8.98") implementation("me.tongfei:progressbar:0.9.0") implementation("io.github.microutils:kotlin-logging:2.0.4") implementation("com.github.ajalt.clikt:clikt:3.1.0") - api("org.junit.platform:junit-platform-engine:${Library.JUNIT_PLATFORM}") - api("org.junit.platform:junit-platform-suite-api:${Library.JUNIT_PLATFORM}") - api("org.junit.platform:junit-platform-launcher:${Library.JUNIT_PLATFORM}") + api("org.junit.platform:junit-platform-engine:${Versions.JUNIT_PLATFORM}") + api("org.junit.platform:junit-platform-suite-api:${Versions.JUNIT_PLATFORM}") + api("org.junit.platform:junit-platform-launcher:${Versions.JUNIT_PLATFORM}") runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.0") - - testImplementation("org.junit.jupiter:junit-jupiter-api:${Library.JUNIT_JUPITER}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Library.JUNIT_JUPITER}") } -- cgit v1.2.3 From 90de768b8bfb3acc222f508d2e602ef3b7f1ff91 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 23 Feb 2021 12:05:59 +0100 Subject: Move dependency versions to gradle.properties This change moves the version of the dependencies from buildSrc to gradle.properties to prevent recompilation when changing dependency versions. --- simulator/opendc-harness/build.gradle.kts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'simulator/opendc-harness/build.gradle.kts') diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts index fd692237..ebede556 100644 --- a/simulator/opendc-harness/build.gradle.kts +++ b/simulator/opendc-harness/build.gradle.kts @@ -29,17 +29,17 @@ plugins { } dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.KOTLINX_COROUTINES}") - api("org.junit.platform:junit-platform-commons:${Versions.JUNIT_PLATFORM}") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinxCoroutines}") + api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}") implementation("io.github.classgraph:classgraph:4.8.98") implementation("me.tongfei:progressbar:0.9.0") - implementation("io.github.microutils:kotlin-logging:2.0.4") + implementation("io.github.microutils:kotlin-logging:${versions.kotlinLogging}") implementation("com.github.ajalt.clikt:clikt:3.1.0") - api("org.junit.platform:junit-platform-engine:${Versions.JUNIT_PLATFORM}") - api("org.junit.platform:junit-platform-suite-api:${Versions.JUNIT_PLATFORM}") - api("org.junit.platform:junit-platform-launcher:${Versions.JUNIT_PLATFORM}") + api("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") + api("org.junit.platform:junit-platform-suite-api:${versions.junitPlatform}") + api("org.junit.platform:junit-platform-launcher:${versions.junitPlatform}") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.14.0") + runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") } -- cgit v1.2.3 From 2119427fe6f7874867c6985cacda28befc53436b Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 23 Feb 2021 12:37:31 +0100 Subject: Utilize version constraints for shared versions This change updates the Gradle configuration to utilize version constraints to force the same dependency version across modules. --- simulator/opendc-harness/build.gradle.kts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'simulator/opendc-harness/build.gradle.kts') diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts index ebede556..25ffbd57 100644 --- a/simulator/opendc-harness/build.gradle.kts +++ b/simulator/opendc-harness/build.gradle.kts @@ -29,17 +29,17 @@ plugins { } dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinxCoroutines}") + api("org.jetbrains.kotlinx:kotlinx-coroutines-core") api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}") - implementation("io.github.classgraph:classgraph:4.8.98") - implementation("me.tongfei:progressbar:0.9.0") - implementation("io.github.microutils:kotlin-logging:${versions.kotlinLogging}") - implementation("com.github.ajalt.clikt:clikt:3.1.0") + implementation("io.github.classgraph:classgraph:${versions["classgraph"]}") + implementation("io.github.microutils:kotlin-logging") + implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}") + implementation("me.tongfei:progressbar:${versions["progressbar"]}") - api("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") - api("org.junit.platform:junit-platform-suite-api:${versions.junitPlatform}") - api("org.junit.platform:junit-platform-launcher:${versions.junitPlatform}") + implementation("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") + implementation("org.junit.platform:junit-platform-suite-api:${versions.junitPlatform}") + implementation("org.junit.platform:junit-platform-launcher:${versions.junitPlatform}") runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") } -- cgit v1.2.3 From 7adbef95ee487cba4eb368b01759be341e35e97b Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 23 Feb 2021 14:35:13 +0100 Subject: Remove unnecessary JUnit dependencies in opendc-harness This change removes unnecessary JUnit dependencies from the opendc-harness module. They are not used nor should they be used by the harness. --- simulator/opendc-harness/build.gradle.kts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'simulator/opendc-harness/build.gradle.kts') diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts index 25ffbd57..132b9b3b 100644 --- a/simulator/opendc-harness/build.gradle.kts +++ b/simulator/opendc-harness/build.gradle.kts @@ -32,14 +32,12 @@ dependencies { api("org.jetbrains.kotlinx:kotlinx-coroutines-core") api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}") + implementation("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") implementation("io.github.classgraph:classgraph:${versions["classgraph"]}") implementation("io.github.microutils:kotlin-logging") + implementation("com.github.ajalt.clikt:clikt:${versions["clikt"]}") implementation("me.tongfei:progressbar:${versions["progressbar"]}") - implementation("org.junit.platform:junit-platform-engine:${versions.junitPlatform}") - implementation("org.junit.platform:junit-platform-suite-api:${versions.junitPlatform}") - implementation("org.junit.platform:junit-platform-launcher:${versions.junitPlatform}") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}") } -- cgit v1.2.3 From 15fcd1a10018605f59ca7a644b8f3b3960e7b6b0 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Tue, 23 Feb 2021 21:40:53 +0100 Subject: Use Java Platform for shared dependency constraints This change uses the Java Platform functionality from Gradle to enable shared dependency constraints across modules. --- simulator/opendc-harness/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'simulator/opendc-harness/build.gradle.kts') diff --git a/simulator/opendc-harness/build.gradle.kts b/simulator/opendc-harness/build.gradle.kts index 132b9b3b..f980853c 100644 --- a/simulator/opendc-harness/build.gradle.kts +++ b/simulator/opendc-harness/build.gradle.kts @@ -29,6 +29,7 @@ plugins { } dependencies { + api(platform(project(":opendc-platform"))) api("org.jetbrains.kotlinx:kotlinx-coroutines-core") api("org.junit.platform:junit-platform-commons:${versions.junitPlatform}") -- cgit v1.2.3