From 2eb8bee328db674b89bd7909e9fca9bfbee8faab Mon Sep 17 00:00:00 2001 From: David Byron <82477955+dbyron-sf@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:12:33 -0800 Subject: [PATCH] centralize lombok dependencies in build.gradle and use enforcedPlatform with kork-bom (#1069) * chore(dependencies): centralize lombok dependencies in build.gradle to remove duplication. Also add a testCompileOnly dependency to make lombok available to test code and to follow https://projectlombok.org/setup/gradle. * chore(dependencies): use enforcedPlatform with kork-bom since it really is supposed to determine what versions of dependencies to use. This also matches what [clouddriver](https://github.com/spinnaker/clouddriver/blob/3f31190d40419218fd1d31ca78bb1661f1ef881a/build.gradle) does. No differences in the output of: ``` alias gradle-all-deps='./gradlew --no-parallel --stacktrace dependencies $(./gradlew -q projects \ | grep -Fe ---\ Project \ | sed -Ee "s/^.+--- Project '"'([^']+)'/\1:dependencies/"'" | sort)' ``` --- build.gradle | 10 ++++++++-- rosco-core/rosco-core.gradle | 3 --- rosco-manifests/rosco-manifests.gradle | 3 --- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 63fb4a60b..2b6fdab41 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,17 @@ subprojects { dependencies { implementation enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion") - annotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") + compileOnly "org.projectlombok:lombok" + + annotationProcessor enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion") annotationProcessor "org.projectlombok:lombok" annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - testAnnotationProcessor platform("io.spinnaker.kork:kork-bom:$korkVersion") + + testCompileOnly "org.projectlombok:lombok" + + testAnnotationProcessor enforcedPlatform("io.spinnaker.kork:kork-bom:$korkVersion") testAnnotationProcessor "org.projectlombok:lombok" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" } diff --git a/rosco-core/rosco-core.gradle b/rosco-core/rosco-core.gradle index f73a397a0..5d9d5dc64 100644 --- a/rosco-core/rosco-core.gradle +++ b/rosco-core/rosco-core.gradle @@ -1,7 +1,4 @@ dependencies { - compileOnly "org.projectlombok:lombok" - annotationProcessor "org.projectlombok:lombok" - api "io.spinnaker.kork:kork-artifacts" api "io.spinnaker.kork:kork-plugins" api "org.codehaus.groovy:groovy" diff --git a/rosco-manifests/rosco-manifests.gradle b/rosco-manifests/rosco-manifests.gradle index fe9058215..43df7f081 100644 --- a/rosco-manifests/rosco-manifests.gradle +++ b/rosco-manifests/rosco-manifests.gradle @@ -1,9 +1,6 @@ dependencies { implementation project(":rosco-core") - compileOnly "org.projectlombok:lombok" - annotationProcessor "org.projectlombok:lombok" - implementation "org.springframework.boot:spring-boot-starter-web" implementation "io.spinnaker.kork:kork-artifacts" implementation "io.spinnaker.kork:kork-exceptions"