From 2bd57aa3cf18b321b4f6e0ae7b5e4f7bb84df4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 15:36:33 +0000 Subject: [PATCH 1/8] Add gitattributes to make Spotless work on Windows. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..fcadb2cf97 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf From c6448897e13b7c81c08c40d196b6415a7aee7589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 15:38:05 +0000 Subject: [PATCH 2/8] Add gradlew.bat support --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index fcadb2cf97..6931266bab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ * text eol=lf +gradlew.bat text eol=crlf From aa03d2e8c85fe0ca6016c11d7a33bd2caddadf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 15:41:45 +0000 Subject: [PATCH 3/8] Add binary support --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6931266bab..8d4655fc57 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ * text eol=lf gradlew.bat text eol=crlf +*.png binary +*.jar binary From 808ae230dc38114cd9afe2b25f74ff4787844f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 16:06:30 +0000 Subject: [PATCH 4/8] Reorder for easier understanding --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8d4655fc57..f8c7ab2067 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -* text eol=lf -gradlew.bat text eol=crlf *.png binary *.jar binary +gradlew.bat text eol=crlf +* text eol=lf From 34dd2507c3c4892fc69819acc47b51b68898f266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 16:18:49 +0000 Subject: [PATCH 5/8] Be more explicit --- .gitattributes | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index f8c7ab2067..c895c371e8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,17 @@ -*.png binary -*.jar binary -gradlew.bat text eol=crlf -* text eol=lf +# Source code +*.kt text eol=lf +*.java text eol=lf +*.xml text eol=lf + +# Gradle files +*.gradle text eol=lf +*.properties text eol=lf +*.bat text eol=crlf + +# GitHub stuff +*.md text eol=lf +*.yml text eol=lf + +# Binaries +*.png binary +*.jar binary From 670b86f3d1afe1d9fa4c0d3e58620c498e184278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 16:31:16 +0000 Subject: [PATCH 6/8] Removed the wrapper customization, since Paparazzi is not using the "all" distribution anymore. --- build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.gradle b/build.gradle index ae45a10b78..4b42ba418b 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,3 @@ subprojects { tasks.register("clean", Delete).configure { delete rootProject.buildDir } - -tasks.named("wrapper").configure { - distributionType = Wrapper.DistributionType.ALL -} From c2d9a95b604f274917c61e1fa697c76920567b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 16:56:36 +0000 Subject: [PATCH 7/8] Code review --- .gitattributes | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index c895c371e8..966f8e3b2b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,5 @@ -# Source code -*.kt text eol=lf -*.java text eol=lf -*.xml text eol=lf +* text=auto eol=lf -# Gradle files -*.gradle text eol=lf -*.properties text eol=lf -*.bat text eol=crlf - -# GitHub stuff -*.md text eol=lf -*.yml text eol=lf - -# Binaries -*.png binary -*.jar binary +*.bat text eol=crlf +*.jar binary +*.png binary From b19ca5d30b51f2324cc288391f07ff20d12dd125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?= Date: Thu, 19 Jan 2023 16:57:34 +0000 Subject: [PATCH 8/8] Revert "Removed the wrapper customization, since Paparazzi is not using the "all" distribution anymore." This reverts commit 670b86f3d1afe1d9fa4c0d3e58620c498e184278. --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 4b42ba418b..ae45a10b78 100644 --- a/build.gradle +++ b/build.gradle @@ -68,3 +68,7 @@ subprojects { tasks.register("clean", Delete).configure { delete rootProject.buildDir } + +tasks.named("wrapper").configure { + distributionType = Wrapper.DistributionType.ALL +}