diff options
author | Christian Williams <christianw@google.com> | 2017-11-01 13:11:06 -0700 |
---|---|---|
committer | Christian Williams <christianw@google.com> | 2017-11-01 13:11:06 -0700 |
commit | 1914b01c68703772e9f7db3e478b54304e4f2b9e (patch) | |
tree | cb313a8ac7ec3514d3cdbfb12db7afd7acf94cea /buildSrc | |
parent | b31ee88d4ae2f9adc1e7a77a848a6d74b49a86c7 (diff) | |
parent | 6860bf6c4dafbaaeda631deb3be001f3aba93399 (diff) | |
download | robolectric-shadows-1914b01c68703772e9f7db3e478b54304e4f2b9e.tar.gz |
Merge branch 'idea-annotation-processing'
Diffstat (limited to 'buildSrc')
-rw-r--r-- | buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy | 6 | ||||
-rw-r--r-- | buildSrc/src/main/groovy/ShadowsPlugin.groovy | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy b/buildSrc/src/main/groovy/RoboJavaModulePlugin.groovy index 09e3c9fd1..fe0f490be 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 { |