aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Williams <christianw@google.com>2017-10-31 19:33:57 -0700
committerChristian Williams <christianw@google.com>2017-10-31 19:33:57 -0700
commitd1aeb98a6fe478462dfcc487240d7920c7a0896c (patch)
treec641337407302e08132684c5e6870900c8a9323e
parent4e556b3e5ccc4aa5098667a2a2380b1769b6fcaa (diff)
downloadrobolectric-shadows-d1aeb98a6fe478462dfcc487240d7920c7a0896c.tar.gz
Don't try to configure IntelliJ annotation processing for now, it's busted.
-rw-r--r--build.gradle9
-rw-r--r--buildSrc/src/main/groovy/ShadowsPlugin.groovy21
2 files changed, 2 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle
index c0d8cd754..0f4d623be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,14 +22,7 @@ allprojects {
}
apply plugin: 'idea'
-apply plugin: 'net.ltgt.apt-idea'
-
-idea {
- project {
- // experimental: whether annotation processing will be configured in the IDE; only actually used with the 'idea' task.
- configureAnnotationProcessing = true
- }
-}
+apply plugin: 'net.ltgt.apt'
apply plugin: 'nebula-aggregate-javadocs'
apply plugin: 'ch.raffael.pegdown-doclet'
diff --git a/buildSrc/src/main/groovy/ShadowsPlugin.groovy b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
index 3799151c7..b3e3040e7 100644
--- a/buildSrc/src/main/groovy/ShadowsPlugin.groovy
+++ b/buildSrc/src/main/groovy/ShadowsPlugin.groovy
@@ -7,8 +7,7 @@ import java.util.jar.JarFile
class ShadowsPlugin implements Plugin<Project> {
@Override
void apply(Project project) {
- project.apply plugin: "idea"
- project.apply plugin: "net.ltgt.apt-idea"
+ project.apply plugin: "net.ltgt.apt"
project.extensions.create("shadows", ShadowsPluginExtension)
@@ -41,24 +40,6 @@ class ShadowsPlugin implements Plugin<Project> {
def shadowPackageNameDir = project.shadows.packageName.replaceAll(/\./, '/')
checkForFile(task.archivePath, "${shadowPackageNameDir}/Shadows.java")
}
-
- project.idea {
- module {
- apt {
- // whether generated sources dirs are added as generated sources root
- addGeneratedSourcesDirs = true
- // whether the apt and testApt dependencies are added as module dependencies
- addAptDependencies = true
-
- // The following are mostly internal details; you shouldn't ever need to configure them.
- // whether the compileOnly and testCompileOnly dependencies are added as module dependencies
- addCompileOnlyDependencies = false // defaults to true in Gradle < 2.12
- // the dependency scope used for apt and/or compileOnly dependencies (when enabled above)
- mainDependenciesScope = "PROVIDED" // defaults to "COMPILE" in Gradle < 3.4, or when using the Gradle integration in IntelliJ IDEA
- }
- }
-
- }
}
static class ShadowsPluginExtension {