From 67fb9de33fc0ab5289770b23210401948f63e5c3 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 2 Sep 2021 12:58:19 +0200 Subject: build: Update to Gradle 7.2 This change updates the Gradle version of the supplied Gradle wrapper to version 7.2. * Update Gradle to version 7.2 * Address incompatibilities with version catalog * Remove opendc-format module. --- buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'buildSrc/src') diff --git a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts index 78ed5d1f..590f51cf 100644 --- a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts @@ -50,14 +50,14 @@ benchmark { targets { register("jmh") { this as JvmBenchmarkTarget - jmhVersion = "1.32" + jmhVersion = "1.33" } } } dependencies { val libs = Libs(project) - implementation(libs["kotlinx-benchmark-runtime-jvm"]) + implementation(libs["kotlinx.benchmark.runtime.jvm"]) } // Workaround for https://github.com/Kotlin/kotlinx-benchmark/issues/39 diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts index bceb9e00..ebeb58a4 100644 --- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts @@ -36,8 +36,8 @@ tasks.test { dependencies { val libs = Libs(project) - testImplementation(libs["junit-jupiter-api"]) - testImplementation(libs["junit-jupiter-params"]) + testImplementation(libs["junit.jupiter.api"]) + testImplementation(libs["junit.jupiter.params"]) testImplementation(libs["mockk"]) - testRuntimeOnly(libs["junit-jupiter-engine"]) + testRuntimeOnly(libs["junit.jupiter.engine"]) } -- cgit v1.2.3