Merge pull request #224 from grails/fix-eol-chars

Fix EOL characters
grails · Oct 31, 2023 · 6d51716 · 6d51716
2 parents 2abe91a + ddda637
commit 6d51716
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+# Files that will always have CRLF line endings on checkout
+*.bat text eol=crlf
diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/Gradle.java b/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/Gradle.java
@@ -64,8 +64,8 @@ public void apply(GeneratorContext generatorContext) {
 
         generatorContext.addTemplate("gradleWrapperJar", new BinaryTemplate(WRAPPER_JAR, classLoader.getResource(WRAPPER_JAR)));
         generatorContext.addTemplate("gradleWrapperProperties", new URLTemplate(WRAPPER_PROPS, classLoader.getResource(WRAPPER_PROPS)));
-        generatorContext.addTemplate("gradleWrapper", new URLTemplate("gradlew", classLoader.getResource("gradle/gradlew"), true));
-        generatorContext.addTemplate("gradleWrapperBat", new URLTemplate("gradlew.bat", classLoader.getResource("gradle/gradlew.bat"), false));
+        generatorContext.addTemplate("gradleWrapper", new BinaryTemplate("gradlew", classLoader.getResource("gradle/gradlew"), true));
+        generatorContext.addTemplate("gradleWrapperBat", new BinaryTemplate("gradlew.bat", classLoader.getResource("gradle/gradlew.bat"), false));
 
         generatorContext.addBuildPlugin(GradlePlugin.builder().id("eclipse").build());
         generatorContext.addBuildPlugin(GradlePlugin.builder().id("idea").build());

diff --git a/grails-forge-core/src/main/java/org/grails/forge/template/BinaryTemplate.java b/grails-forge-core/src/main/java/org/grails/forge/template/BinaryTemplate.java
@@ -23,6 +23,10 @@ public BinaryTemplate(String path, URL url) {
         super(path, url);
     }
 
+    public BinaryTemplate(String path, URL url, boolean executable) {
+        super(path, url, executable);
+    }
+
     @Override
     public boolean isBinary() {
         return true;