Merge pull request #14436 from rmuir/nukeSettings

gradle cleanEclipse should completely nuke .settings.

.settings/org.eclipse.jdt.core.prefs

@@ -1,18 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.common.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.formatter.lineSplit=140
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4

build.gradle

@@ -178,8 +178,19 @@ allprojects {
       }
     }
   }
+  task cleanEclipseSettings(type: Delete) {
+    delete '.settings'
+  }
+  task copyEclipseSettings(type: Copy) {
+    // TODO: "package this up" for external builds
+    from new File(project.rootDir, 'buildSrc/src/main/resources/eclipse.settings')
+    into '.settings'
+  }
+  // otherwise .settings is not nuked entirely
+  tasks.cleanEclipse.dependsOn(cleanEclipseSettings)
   // otherwise the eclipse merging is *super confusing*
   tasks.eclipse.dependsOn(cleanEclipse)
+  tasks.eclipse.dependsOn(copyEclipseSettings)
 }
 
 

buildSrc/src/main/resources/eclipse.settings/org.eclipse.core.resources.prefs

@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding/<project>=UTF-8
-encoding/rest-api-spec=UTF-8
+encoding/<project>=UTF-8

buildSrc/src/main/resources/eclipse.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,22 @@
+eclipse.preferences.version=1
+
+# previous configuration from maven build
+# this is merged with gradle's generated properties during 'gradle eclipse'
+
+# NOTE: null pointer analysis etc is not enabled currently, it seems very unstable
+# (e.g. crashing eclipse etc)
+# org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+# org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+# org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.common.Nullable
+# org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+# org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+# org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+# org.eclipse.jdt.core.compiler.problem.nullReference=warning
+# org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+# org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+# org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.formatter.lineSplit=140
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4