Merge pull request #57 from palantir/issue56

Default Eclipse to write to generated/java, not bin/generated/java
palantir · Feb 2, 2017 · 72c682d · 72c682d
2 parents 54a1a04 + 2558cc3
commit 72c682d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 43 deletions.
diff --git a/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy b/src/main/groovy/org/inferred/gradle/ProcessorsPlugin.groovy
@@ -45,7 +45,7 @@ class ProcessorsPlugin implements Plugin<Project> {
           project.eclipse {
             extensions.create('processors', EclipseProcessorsExtension)
             processors.conventionMapping.outputDir = {
-              new File(project.eclipse.classpath.defaultOutputDir, 'generated/java')
+              project.file('generated/java')
             }
 
             classpath.plusConfigurations += [project.configurations.processor]

diff --git a/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy b/src/test/groovy/org/inferred/gradle/ProcessorsPluginFunctionalTest.groovy
@@ -276,48 +276,7 @@ public class ProcessorsPluginFunctionalTest {
     def expected = """
       eclipse.preferences.version=1
       org.eclipse.jdt.apt.aptEnabled=true
-      org.eclipse.jdt.apt.genSrcDir=bin/generated/java
-      org.eclipse.jdt.apt.reconcileEnabled=true
-    """.replaceFirst('\n','').stripIndent()
-    assertEquals(expected, prefsFile.text)
-  }
-
-  @Test
-  public void testEclipseAptPrefsUsesDefaultOutputDir() throws IOException {
-    buildFile << """
-      apply plugin: 'java'
-      apply plugin: 'eclipse'
-      apply plugin: 'org.inferred.processors'
-
-      dependencies {
-        processor 'org.immutables:value:2.0.21'
-      }
-
-      eclipse.classpath.defaultOutputDir = file('something')
-    """
-
-    new File(testProjectDir.newFolder('src', 'main', 'java'), 'MyClass.java') << """
-      import org.immutables.value.Value;
-
-      @Value.Immutable
-      public interface MyClass {
-        @Value.Parameter String getValue();
-      }
-    """
-
-    File testProjectDirRoot = testProjectDir.getRoot()
-
-    GradleRunner.create()
-            .withProjectDir(testProjectDirRoot)
-            .withArguments("eclipseAptPrefs")
-            .build()
-
-    def prefsFile = new File(testProjectDirRoot, ".settings/org.eclipse.jdt.apt.core.prefs")
-
-    def expected = """
-      eclipse.preferences.version=1
-      org.eclipse.jdt.apt.aptEnabled=true
-      org.eclipse.jdt.apt.genSrcDir=something/generated/java
+      org.eclipse.jdt.apt.genSrcDir=generated/java
       org.eclipse.jdt.apt.reconcileEnabled=true
     """.replaceFirst('\n','').stripIndent()
     assertEquals(expected, prefsFile.text)