From 8bb4f4a86b131e9740a8074cb5775930f8280019 Mon Sep 17 00:00:00 2001 From: aSemy <897017+aSemy@users.noreply.github.com> Date: Fri, 17 Mar 2023 15:27:03 +0100 Subject: Introduce Gradle Version Catalog with type-safe project dependencies (#2884) --- plugins/gfm/build.gradle.kts | 25 ++++++++++------------ .../gfm/gfm-template-processing/build.gradle.kts | 23 ++++++++++---------- 2 files changed, 22 insertions(+), 26 deletions(-) (limited to 'plugins/gfm') diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts index 8892362b..6cdadefb 100644 --- a/plugins/gfm/build.gradle.kts +++ b/plugins/gfm/build.gradle.kts @@ -6,22 +6,19 @@ plugins { } dependencies { - compileOnly(project(":core")) - implementation(kotlin("stdlib-jdk8")) - implementation(kotlin("stdlib")) + compileOnly(projects.core) implementation(kotlin("reflect")) - implementation(project(":plugins:base")) - testImplementation(project(":plugins:base")) - testImplementation(project(":plugins:base:base-test-utils")) - val jackson_version: String by project - implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version") - testImplementation(project(":test-utils")) - testImplementation(project(":core:test-api")) - testImplementation("org.junit.jupiter:junit-jupiter:5.6.0") - - val jackson_databind_version: String by project + implementation(projects.plugins.base) + testImplementation(projects.plugins.base) + testImplementation(projects.plugins.base.baseTestUtils) + implementation(libs.jackson.kotlin) + testImplementation(projects.testUtils) + testImplementation(projects.core.testApi) + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) + constraints { - implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version") { + implementation(libs.jackson.databind) { because("CVE-2022-42003") } } diff --git a/plugins/gfm/gfm-template-processing/build.gradle.kts b/plugins/gfm/gfm-template-processing/build.gradle.kts index 41790b44..75634ed2 100644 --- a/plugins/gfm/gfm-template-processing/build.gradle.kts +++ b/plugins/gfm/gfm-template-processing/build.gradle.kts @@ -6,21 +6,20 @@ plugins { } dependencies { - compileOnly(project(":core")) - implementation(kotlin("stdlib-jdk8")) - implementation(kotlin("stdlib")) + compileOnly(projects.core) + implementation(kotlin("reflect")) - implementation(project(":plugins:base")) - implementation(project(":plugins:gfm")) - implementation(project(":plugins:all-modules-page")) - implementation(project(":plugins:templating")) + implementation(projects.plugins.base) + implementation(projects.plugins.gfm) + implementation(projects.plugins.allModulesPage) + implementation(projects.plugins.templating) - val coroutines_version: String by project - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version") + implementation(libs.kotlinx.coroutines.core) - testImplementation(project(":test-utils")) - testImplementation(project(":core:test-api")) - testImplementation("org.junit.jupiter:junit-jupiter:5.6.0") + testImplementation(projects.testUtils) + testImplementation(projects.core.testApi) + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter) } registerDokkaArtifactPublication("dokkaGfmTemplateProcessing") { -- cgit