From e2152933238280f484c1868b0f49c85c21806f3e Mon Sep 17 00:00:00 2001
From: George Sexton <gsexton@mhsoftware.com>
Date: Wed, 25 Apr 2018 19:02:39 -0600
Subject: [PATCH 1/4] Fix java.io.File import.

---
 buildscripts/cldr/build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildscripts/cldr/build.xml b/buildscripts/cldr/build.xml
index 1f970cb2..29d8c2cd 100644
--- a/buildscripts/cldr/build.xml
+++ b/buildscripts/cldr/build.xml
@@ -110,8 +110,7 @@
 			f.isDirectory() ? delTask.setDir(f) : delTask.setFile(f);
 			delTask.perform();
 		}
-
-	importClass(java.io.File);
+	var File=java.io.File;
 	var fs = project.createDataType("fileset");
 	var dir = new File(attributes.get("dir"));
 	fs.setDir(dir);
@@ -197,7 +196,7 @@ java.lang.System.out.print(contents);
 			<attribute name="destdir"/>
 			<element name="fileset" type="fileset"/>
 			<![CDATA[
-	importClass(java.io.File);
+	var File=java.io.File;
 	var fs = elements.get("fileset").get(0);
 	var basedir = fs.getDir(project);
 	var filter = project.getProperty("locales");

From d30f0b3cbdfd4ba7a3d38659938c28dc3649aebe Mon Sep 17 00:00:00 2001
From: George Sexton <georges@mhsoftware.com>
Date: Wed, 25 Apr 2018 19:02:39 -0600
Subject: [PATCH 2/4] Fix java.io.File import.

---
 buildscripts/cldr/build.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/buildscripts/cldr/build.xml b/buildscripts/cldr/build.xml
index 1f970cb2..29d8c2cd 100644
--- a/buildscripts/cldr/build.xml
+++ b/buildscripts/cldr/build.xml
@@ -110,8 +110,7 @@
 			f.isDirectory() ? delTask.setDir(f) : delTask.setFile(f);
 			delTask.perform();
 		}
-
-	importClass(java.io.File);
+	var File=java.io.File;
 	var fs = project.createDataType("fileset");
 	var dir = new File(attributes.get("dir"));
 	fs.setDir(dir);
@@ -197,7 +196,7 @@ java.lang.System.out.print(contents);
 			<attribute name="destdir"/>
 			<element name="fileset" type="fileset"/>
 			<![CDATA[
-	importClass(java.io.File);
+	var File=java.io.File;
 	var fs = elements.get("fileset").get(0);
 	var basedir = fs.getDir(project);
 	var filter = project.getProperty("locales");

From b5b33c6461ee4c8fdca758666a7a7f58e1df3b8b Mon Sep 17 00:00:00 2001
From: George Sexton <gsexton@mhsoftware.com>
Date: Wed, 25 Apr 2018 19:12:46 -0600
Subject: [PATCH 3/4] Fix white space.

---
 buildscripts/cldr/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildscripts/cldr/build.xml b/buildscripts/cldr/build.xml
index 29d8c2cd..27f6eaeb 100644
--- a/buildscripts/cldr/build.xml
+++ b/buildscripts/cldr/build.xml
@@ -110,6 +110,7 @@
 			f.isDirectory() ? delTask.setDir(f) : delTask.setFile(f);
 			delTask.perform();
 		}
+
 	var File=java.io.File;
 	var fs = project.createDataType("fileset");
 	var dir = new File(attributes.get("dir"));

From a1404aef7035c0991340764591939d65909b82f9 Mon Sep 17 00:00:00 2001
From: George Sexton <georges@mhsoftware.com>
Date: Wed, 25 Apr 2018 19:12:46 -0600
Subject: [PATCH 4/4] Fix white space.

---
 buildscripts/cldr/build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildscripts/cldr/build.xml b/buildscripts/cldr/build.xml
index 29d8c2cd..27f6eaeb 100644
--- a/buildscripts/cldr/build.xml
+++ b/buildscripts/cldr/build.xml
@@ -110,6 +110,7 @@
 			f.isDirectory() ? delTask.setDir(f) : delTask.setFile(f);
 			delTask.perform();
 		}
+
 	var File=java.io.File;
 	var fs = project.createDataType("fileset");
 	var dir = new File(attributes.get("dir"));