From 2ae4f0b03062151a35b31c3ef8ab686e03ed83a6 Mon Sep 17 00:00:00 2001 From: David Byron <82477955+dbyron-sf@users.noreply.github.com> Date: Tue, 5 Dec 2023 15:53:42 -0500 Subject: [PATCH] chore(dependencies): add dependencies on spinnaker-dependencies (#1126) When projects have dependencies on artifacts, but depend on spinnaker-dependencies to provide the version, this makes the version available and removes failures from ./gradlew dependencies output. Some examples of failures that this removes: testRuntimeOnlyDependenciesMetadata +--- org.junit.jupiter:junit-jupiter-engine FAILED \--- org.junit.platform:junit-platform-launcher FAILED compileOnly - Compile only dependencies for compilation 'main' (target (jvm)). \--- org.projectlombok:lombok FAILED compileOnlyDependenciesMetadata \--- org.projectlombok:lombok FAILED testCompileOnly - Compile only dependencies for compilation 'test' (target (jvm)). \--- org.projectlombok:lombok FAILED testCompileOnlyDependenciesMetadata \--- org.projectlombok:lombok FAILED --- gradle/kotlin-test.gradle | 2 ++ gradle/kotlin.gradle | 2 ++ gradle/lombok.gradle | 2 ++ kork-actuator/kork-actuator.gradle | 1 + kork-plugins-spring-api/kork-plugins-spring-api.gradle | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gradle/kotlin-test.gradle b/gradle/kotlin-test.gradle index af4ebaf76..b6d4c5021 100644 --- a/gradle/kotlin-test.gradle +++ b/gradle/kotlin-test.gradle @@ -20,6 +20,7 @@ apply plugin: "kotlin" dependencies { + testImplementation(platform(project(":spinnaker-dependencies"))) testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" testImplementation "org.junit.jupiter:junit-jupiter-api" @@ -29,6 +30,7 @@ dependencies { testImplementation "dev.minutest:minutest" testImplementation "io.mockk:mockk" + testRuntimeOnly(platform(project(":spinnaker-dependencies"))) testRuntimeOnly "org.junit.platform:junit-platform-launcher" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" } diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle index b8b9c7b2e..203c24938 100644 --- a/gradle/kotlin.gradle +++ b/gradle/kotlin.gradle @@ -19,6 +19,7 @@ apply plugin: "kotlin-spring" apply plugin: "io.gitlab.arturbosch.detekt" dependencies { + testImplementation(platform(project(":spinnaker-dependencies"))) testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.junit.platform:junit-platform-runner" testImplementation "org.spekframework.spek2:spek-dsl-jvm" @@ -28,6 +29,7 @@ dependencies { testImplementation "dev.minutest:minutest" testImplementation "io.mockk:mockk" + testRuntimeOnly(platform(project(":spinnaker-dependencies"))) testRuntimeOnly "org.junit.platform:junit-platform-launcher" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" testRuntimeOnly "org.junit.vintage:junit-vintage-engine" diff --git a/gradle/lombok.gradle b/gradle/lombok.gradle index a94257fc1..93f41b25d 100644 --- a/gradle/lombok.gradle +++ b/gradle/lombok.gradle @@ -1,8 +1,10 @@ dependencies { compileOnly "org.projectlombok:lombok" + compileOnly(platform(project(":spinnaker-dependencies"))) annotationProcessor "org.projectlombok:lombok" annotationProcessor(platform(project(":spinnaker-dependencies"))) testCompileOnly "org.projectlombok:lombok" + testCompileOnly(platform(project(":spinnaker-dependencies"))) testAnnotationProcessor(platform(project(":spinnaker-dependencies"))) testAnnotationProcessor "org.projectlombok:lombok" } diff --git a/kork-actuator/kork-actuator.gradle b/kork-actuator/kork-actuator.gradle index 13686dfa7..0f441b752 100644 --- a/kork-actuator/kork-actuator.gradle +++ b/kork-actuator/kork-actuator.gradle @@ -19,6 +19,7 @@ apply plugin: "java-library" apply from: "$rootDir/gradle/kotlin-test.gradle" dependencies { + compileOnly(platform(project(":spinnaker-dependencies"))) implementation(platform(project(":spinnaker-dependencies"))) implementation "org.springframework.security:spring-security-core" implementation "org.springframework.boot:spring-boot-starter-security" diff --git a/kork-plugins-spring-api/kork-plugins-spring-api.gradle b/kork-plugins-spring-api/kork-plugins-spring-api.gradle index 30afa4da4..202d2464c 100644 --- a/kork-plugins-spring-api/kork-plugins-spring-api.gradle +++ b/kork-plugins-spring-api/kork-plugins-spring-api.gradle @@ -18,7 +18,7 @@ apply plugin: "java-library" apply from: "${project.rootDir}/gradle/kotlin-test.gradle" dependencies { - implementation(platform(project(":spinnaker-dependencies"))) + api(platform(project(":spinnaker-dependencies"))) api project(":kork-plugins-api") api "org.springframework.boot:spring-boot-starter-web"