Revert "Remove annotation processor dependencies from IDEA scopes (#1… (

#165)

changelog/@unreleased/pr-165.v2.yml

@@ -0,0 +1,7 @@
+type: fix
+fix:
+  description: Annotation processor dependencies are no longer explicitly removed
+    from IDEA scopes. As of Gradle 6.3, annotation processor dependencies are no longer
+    added to IDEA scopes by the IDEA plugin.
+  links:
+  - https://github.com/palantir/gradle-processors/pull/165

src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy

@@ -21,8 +21,6 @@ import org.gradle.plugins.ide.eclipse.EclipsePlugin
 import org.gradle.plugins.ide.idea.IdeaPlugin
 import org.gradle.plugins.ide.idea.model.IdeaModel
 import org.gradle.plugins.ide.idea.model.IdeaModule
-import org.gradle.plugins.ide.idea.model.internal.GeneratedIdeaScope
-import org.gradle.plugins.ide.idea.model.internal.IdeaDependenciesProvider
 import org.gradle.util.GradleVersion
 
 class ProcessorsPlugin implements Plugin<Project> {
@@ -161,18 +159,6 @@ class ProcessorsPlugin implements Plugin<Project> {
         addGeneratedSourceFolder(project, { getIdeaSourceTestOutputDir(project) }, true)
       }
 
-      // We need to remove the configurations from the plus configurations.
-      // If we instead added the configurations from the minus configurations, then that would remove dependencies that
-      // are shared with other configurations in the plus configurations.
-      idea.module.scopes
-              .get(GeneratedIdeaScope.PROVIDED.name())
-              .get(IdeaDependenciesProvider.SCOPE_PLUS)
-              .remove(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME)
-      idea.module.scopes
-              .get(GeneratedIdeaScope.TEST.name())
-              .get(IdeaDependenciesProvider.SCOPE_PLUS)
-              .remove(JavaPlugin.TEST_ANNOTATION_PROCESSOR_CONFIGURATION_NAME)
-
       // Root project configuration
       def rootModel = project.rootProject.extensions.findByType(IdeaModel)
       if (rootModel != null && rootModel.project != null) {

src/test/groovy/org/inferred/gradle/ProcessorsPluginTest.groovy

@@ -77,15 +77,4 @@ class ProcessorsPluginTest {
     assertTrue project.idea.module.testSourceDirs.contains(project.file('generated_testSrc'))
     assertTrue project.idea.module.generatedSourceDirs.contains(project.file('generated_testSrc'))
   }
-
-  @Test
-  void configuredIdeaScopes() {
-    Project project = ProjectBuilder.builder().build()
-    project.pluginManager.apply 'org.inferred.processors'
-    project.pluginManager.apply 'java'
-    project.pluginManager.apply 'idea'
-
-    assertFalse project.idea.module.scopes.PROVIDED.plus.contains(project.configurations['annotationProcessor'])
-    assertFalse project.idea.module.scopes.TEST.plus.contains(project.configurations['testAnnotationProcessor'])
-  }
 }