fix(plugins): Do not configure orca-api with dependencies from subpro…

…ject configuration in root build.gradle (spinnaker#3761)
Saumya31 · Jun 25, 2020 · aea3695 · aea3695
1 parent 5dadb78
commit aea3695
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,15 +34,16 @@ allprojects {
 }
 
 subprojects {
-  if (name != "orca-bom") {
-    apply plugin: "java-library"
 
-    if ([korkVersion, keikoVersion, fiatVersion].any { it.endsWith("-SNAPSHOT") }) {
-      logger.info("Enabling mavenLocal")
-      repositories {
-        mavenLocal()
-      }
+  if ([korkVersion, keikoVersion, fiatVersion].any { it.endsWith("-SNAPSHOT") }) {
+    logger.info("Enabling mavenLocal")
+    repositories {
+      mavenLocal()
     }
+  }
+
+  if (name != "orca-bom" && name != "orca-api") {
+    apply plugin: "java-library"
 
     dependencies {
       implementation(platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion"))

diff --git a/orca-api/orca-api.gradle b/orca-api/orca-api.gradle
@@ -23,7 +23,12 @@ sourceSets {
 }
 
 dependencies {
+  implementation platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
+  annotationProcessor platform("com.netflix.spinnaker.kork:kork-bom:$korkVersion")
+
   api("com.netflix.spinnaker.kork:kork-plugins-api")
+
+  //TODO(jonsie): Remove this dependency
   api("com.netflix.spinnaker.kork:kork-artifacts")
 
   compileOnly("org.projectlombok:lombok")