From f5defd80684aff19fd4dd2cb0c9ec3fd07e92f35 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Tue, 27 Jul 2021 20:01:58 -0500
Subject: [PATCH] Adjust build structure for builds requiring older gradle

---
 bukkit-helper/.project                              |  11 +++++++++++
 oldbuilds/.gitignore                                |   2 ++
 {oldgradle => oldbuilds}/build.gradle               |   0
 {oldgradle => oldbuilds}/gradle.properties          |   0
 {oldgradle => oldbuilds}/settings.gradle            |   0
 oldgradle/{gradle => }/wrapper/gradle-wrapper.jar   | Bin
 .../{gradle => }/wrapper/gradle-wrapper.properties  |   0
 oldgradle/gradlew => oldgradlew                     |   2 +-
 oldgradle/gradlew.bat => oldgradlew.bat             |   2 +-
 9 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 oldbuilds/.gitignore
 rename {oldgradle => oldbuilds}/build.gradle (100%)
 rename {oldgradle => oldbuilds}/gradle.properties (100%)
 rename {oldgradle => oldbuilds}/settings.gradle (100%)
 rename oldgradle/{gradle => }/wrapper/gradle-wrapper.jar (100%)
 rename oldgradle/{gradle => }/wrapper/gradle-wrapper.properties (100%)
 rename oldgradle/gradlew => oldgradlew (98%)
 rename oldgradle/gradlew.bat => oldgradlew.bat (93%)

diff --git a/bukkit-helper/.project b/bukkit-helper/.project
index 45e13d21..a9f1167d 100644
--- a/bukkit-helper/.project
+++ b/bukkit-helper/.project
@@ -26,4 +26,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1627430303020</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/oldbuilds/.gitignore b/oldbuilds/.gitignore
new file mode 100644
index 00000000..67bcc2f7
--- /dev/null
+++ b/oldbuilds/.gitignore
@@ -0,0 +1,2 @@
+.gradle/
+build/
diff --git a/oldgradle/build.gradle b/oldbuilds/build.gradle
similarity index 100%
rename from oldgradle/build.gradle
rename to oldbuilds/build.gradle
diff --git a/oldgradle/gradle.properties b/oldbuilds/gradle.properties
similarity index 100%
rename from oldgradle/gradle.properties
rename to oldbuilds/gradle.properties
diff --git a/oldgradle/settings.gradle b/oldbuilds/settings.gradle
similarity index 100%
rename from oldgradle/settings.gradle
rename to oldbuilds/settings.gradle
diff --git a/oldgradle/gradle/wrapper/gradle-wrapper.jar b/oldgradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from oldgradle/gradle/wrapper/gradle-wrapper.jar
rename to oldgradle/wrapper/gradle-wrapper.jar
diff --git a/oldgradle/gradle/wrapper/gradle-wrapper.properties b/oldgradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from oldgradle/gradle/wrapper/gradle-wrapper.properties
rename to oldgradle/wrapper/gradle-wrapper.properties
diff --git a/oldgradle/gradlew b/oldgradlew
similarity index 98%
rename from oldgradle/gradlew
rename to oldgradlew
index cccdd3d5..5f83356e 100755
--- a/oldgradle/gradlew
+++ b/oldgradlew
@@ -64,7 +64,7 @@ case "`uname`" in
     ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/oldgradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
diff --git a/oldgradle/gradlew.bat b/oldgradlew.bat
similarity index 93%
rename from oldgradle/gradlew.bat
rename to oldgradlew.bat
index e95643d6..cc43ef1e 100644
--- a/oldgradle/gradlew.bat
+++ b/oldgradlew.bat
@@ -63,7 +63,7 @@ set CMD_LINE_ARGS=%*
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=%APP_HOME%\oldgradle\wrapper\gradle-wrapper.jar
 
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%