GEODE-6090: Reverting changes, causes new clones to get modified files.

Revert "GEODE-6073: All files have lf endings (apache#2873)" This reverts commit be99d7b.
b-xiang · Nov 26, 2018 · 184dd3c · 184dd3c
1 parent b8d26b1
commit 184dd3c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-* text eol=lf
+*.java text=auto eol=lf
diff --git a/ci/scripts/windows/test-run.sh b/ci/scripts/windows/test-run.sh
@@ -40,7 +40,7 @@ directories_file=${DEST_DIR}/artifact_directories
 echo "GRADLE_TASK = ${GRADLE_TASK}"
 echo "BASE_FILENAME = ${BASE_FILENAME}"
 
-DEFAULT_GRADLE_TASK_OPTIONS="--no-daemon -x javadoc"
+DEFAULT_GRADLE_TASK_OPTIONS="--no-daemon -x javadoc -x spotlessCheck"
 
 if [[ -n "${GRADLE_TEST_CATEGORY}" ]]; then
   GRADLE_TASK_OPTIONS="-PtestCategory=${GRADLE_TEST_CATEGORY}"

diff --git a/gradle/spotless.gradle b/gradle/spotless.gradle
@@ -18,6 +18,7 @@
 subprojects {
   apply plugin: "com.diffplug.gradle.spotless"
   spotless {
+    lineEndings = 'unix'
     java {
       target project.fileTree(project.projectDir) {
         include '**/*.java'