Generates parent.ipr with stuff for compiler.xml.

2 files changed, 6 insertions, 6 deletions

diff --git a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
index e69979c19..fc6e13a51 100644
--- a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy
@@ -37,8 +37,6 @@ class RoboJavaModulePlugin implements Plugin<Project> {
 
         // it's weird that compileOnly deps aren't included for test compilation; fix that:
         project.sourceSets {
-            generated
-
             test.compileClasspath += project.configurations.compileOnly
         }
 
@@ -91,12 +89,12 @@ class RoboJavaModulePlugin implements Plugin<Project> {
 
             task('sourcesJar', type: Jar, dependsOn: classes) {
                 classifier "sources"
-                from sourceSets.main.allJava + sourceSets.generated.allJava
+                from sourceSets.main.allJava
             }
 
             javadoc {
                 failOnError = false
-                source = sourceSets.main.allJava + sourceSets.generated.allJava
+                source = sourceSets.main.allJava
             }
 
             task('javadocJar', type: Jar, dependsOn: javadoc) {
diff --git a/buildSrc/src/main/groovy/ShadowsPlugin.groovy b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
index b3e3040e7..d680972be 100644
--- a/buildSrc/src/main/groovy/ShadowsPlugin.groovy
+++ b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
@@ -23,9 +23,9 @@ class ShadowsPlugin implements Plugin<Project> {
         def aptGeneratedSrcDir = new File(project.buildDir, 'generated/source/apt/main')
 
         project.sourceSets {
-            generated {
+            main {
                 java {
-                    srcDirs = [aptGeneratedSrcDir]
+                    srcDirs += [aptGeneratedSrcDir]
                 }
             }
         }
@@ -40,6 +40,8 @@ class ShadowsPlugin implements Plugin<Project> {
             def shadowPackageNameDir = project.shadows.packageName.replaceAll(/\./, '/')
             checkForFile(task.archivePath, "${shadowPackageNameDir}/Shadows.java")
         }
+
+        project.rootProject.configAnnotationProcessing += project
     }
 
     static class ShadowsPluginExtension {