Merge pull request #117 from chali/HandleAllAnnotationProcessorConfig…

…urations Extend application of gradle platforms to all annotationProcessor configurations
nebula-plugins · Aug 28, 2020 · 2875268 · 2875268
2 parents 900b54f + e041c7c
commit 2875268
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...in/groovy/netflix/nebula/dependency/recommender/ExtendRecommenderConfigurationAction.java b/...in/groovy/netflix/nebula/dependency/recommender/ExtendRecommenderConfigurationAction.java
@@ -43,7 +43,7 @@ public void execute(Configuration configuration) {
 
     //we want to apply recommendation only into final resolvable configurations like `compileClasspath` or `runtimeClasspath` across all source sets.
     private boolean isClasspathConfiguration(Configuration configuration) {
-        return configuration.getName().endsWith("Classpath") || configuration.getName().equals("annotationProcessor");
+        return configuration.getName().endsWith("Classpath") || configuration.getName().toLowerCase().endsWith("annotationprocessor");
     }
 
     //this action creates clones of bom configuration from root and gradle will also apply the action to them which would

diff --git a/...ebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy b/...ebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy
@@ -54,11 +54,10 @@ class DependencyRecommendationsPluginConfigurationCacheSpec extends IntegrationT
             }
             """.stripIndent()
 
-        when:
-        def result = runTasks('--configuration-cache', 'dependencies')
-
-        then:
-        result.output.contains 'test.nebula:foo -> 1.0.0'
+        expect:
+        //TODO we don't support configuration cache yet so we expect the test to fail
+        //this should help us https://github.com/gradle/gradle/issues/12871
+        runTasksAndFail('--configuration-cache', 'dependencies')
     }
 
 }
diff --git a/...ix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy b/...ix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy
@@ -40,6 +40,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationSpec
         pom.addManagementDependency('test.nebula', 'lib', '3.9.9')
         pom.addManagementDependency('test.nebula', 'app', '8.0.0')
         pom.addManagementDependency('test.nebula', 'moa', '9.0.0')
+        pom.addManagementDependency('test.nebula', 'koa', '10.0.0')
         repo.poms.add(pom)
         repo.generate()
         def graph = new DependencyGraphBuilder()
@@ -51,6 +52,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationSpec
                 .addModule('test.nebula:app:8.0.0')
                 .addModule('test.nebula:app:9.0.0')
                 .addModule('test.nebula:moa:9.0.0')
+                .addModule('test.nebula:koa:10.0.0')
                 .build()
         generator = new GradleDependencyGenerator(graph)
         generator.generateTestMavenRepo()
@@ -74,6 +76,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationSpec
 
             dependencies {
                 annotationProcessor 'test.nebula:bar'
+                testAnnotationProcessor 'test.nebula:koa'
                 compile 'test.nebula:foo'
                 implementation 'test.nebula:moa'
                 providedCompile 'test.nebula:lib'
@@ -93,6 +96,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationSpec
         result.standardOutput.contains("+--- test.nebula:moa -> 9.0.0")
         result.standardOutput.contains("\\--- test.nebula:baz -> 2.5.0")
         result.standardOutput.contains("\\--- test.nebula:lib -> 3.9.9")
+        result.standardOutput.contains("\\--- test.nebula:koa -> 10.0.0")
 
         compileOnlyResult.standardOutput.contains("compileOnly - Compile only dependencies for source set 'main'")
         compileOnlyResult.standardOutput.contains("\\--- test.nebula:app:7.0.0")