From 6efc58e3dbfc3e423feff52f5590619597ae65d8 Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Sat, 16 Jan 2021 20:26:52 -0800
Subject: [PATCH] [build] Fix issues with build on windows, deprecations, and
 native utils (#3090)

---
 .gitattributes                  | 4 ++++
 .wpilib/wpilib_preferences.json | 2 +-
 buildSrc/build.gradle           | 2 +-
 glass/publish.gradle            | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d8c3d837fd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+*.gradle text eol=lf
+*.java text eol=lf
+*.md text eol=lf
+*.xml text eol=lf
diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json
index 39a096cd8b..683ba3ba63 100644
--- a/.wpilib/wpilib_preferences.json
+++ b/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
   "enableCppIntellisense": true,
   "currentLanguage": "cpp",
-  "projectYear": "2020",
+  "projectYear": "2021",
   "teamNumber": 0
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 71f66917a7..60dcb613ef 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,5 +5,5 @@ repositories {
     }
 }
 dependencies {
-    implementation "edu.wpi.first:native-utils:2021.1.0"
+    implementation "edu.wpi.first:native-utils:2021.1.1"
 }
diff --git a/glass/publish.gradle b/glass/publish.gradle
index 70a5a0b577..49aac0d7e3 100644
--- a/glass/publish.gradle
+++ b/glass/publish.gradle
@@ -53,7 +53,7 @@ model {
                         def outputsFolder = file("$project.buildDir/outputs")
                         def task = project.tasks.create("copyGlassExecutable", Zip) {
                             description("Copies the Glass executable to the outputs directory.")
-                            destinationDir(outputsFolder)
+                            destinationDirectory = outputsFolder
 
                             archiveBaseName = '_M_' + zipBaseName
                             duplicatesStrategy = 'exclude'