- Changes to configuration XML towards Gradle information

- Necessary changes applied to detection logic (reference #9)
Moonshine-IDE · May 15, 2019 · a8faf86 · a8faf86
1 parent e555a80
commit a8faf86
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/InstallerSharedCore/src/actionScripts/interfaces/IHelperMoonshineBridge.as b/InstallerSharedCore/src/actionScripts/interfaces/IHelperMoonshineBridge.as
@@ -10,6 +10,7 @@ package actionScripts.interfaces
 		function isJavaPresent():Boolean;
 		function isAntPresent():Boolean;
 		function isMavenPresent():Boolean;
+		function isGradlePresent():Boolean;
 		function isSVNPresent():Boolean;
 		function isGitPresent():Boolean;
 		function runOrDownloadSDKInstaller():void;

diff --git a/InstallerSharedCore/src/actionScripts/managers/DetectionManager.as b/InstallerSharedCore/src/actionScripts/managers/DetectionManager.as
@@ -101,6 +101,9 @@ package actionScripts.managers
 					case ComponentTypes.TYPE_MAVEN:
 						item.isAlreadyDownloaded = model.moonshineBridge.isMavenPresent();
 						break;
+					case ComponentTypes.TYPE_GRADLE:
+						item.isAlreadyDownloaded = model.moonshineBridge.isGradlePresent();
+						break;
 					case ComponentTypes.TYPE_OPENJAVA:
 						item.isAlreadyDownloaded = model.moonshineBridge.isJavaPresent();
 						break;
@@ -160,6 +163,13 @@ package actionScripts.managers
 							item.isAlreadyDownloaded = true;
 						}
 						break;
+					case ComponentTypes.TYPE_GRADLE:
+						if (environmentUtil.environments.GRADLE_HOME) 
+						{
+							item.installToPath = environmentUtil.environments.GRADLE_HOME.nativePath;
+							item.isAlreadyDownloaded = true;
+						}
+						break;
 					case ComponentTypes.TYPE_OPENJAVA:
 						if (environmentUtil.environments.JAVA_HOME) 
 						{

diff --git a/InstallerSharedCore/src/actionScripts/utils/Parser.as b/InstallerSharedCore/src/actionScripts/utils/Parser.as
@@ -65,6 +65,14 @@ package actionScripts.utils
 						to.MAVEN_HOME = tmpPath;
 					}
 				}
+				else if (splitLine[0] == "GRADLE_HOME")
+				{
+					tmpPath = new File(splitLine[1]);
+					if (tmpPath.exists)
+					{
+						to.GRADLE_HOME = tmpPath;
+					}
+				}
 				else if (splitLine[0] == "GIT_HOME")
 				{
 					tmpPath = new File(splitLine[1]);

diff --git a/InstallerSharedCore/src/actionScripts/valueObjects/EnvironmentVO.as b/InstallerSharedCore/src/actionScripts/valueObjects/EnvironmentVO.as
@@ -8,6 +8,7 @@ package actionScripts.valueObjects
 		public var JAVA_HOME:File;
 		public var FLEX_HOME:HelperSDKVO;
 		public var MAVEN_HOME:File;
+		public var GRADLE_HOME:File;
 		public var GIT_HOME:File;
 		public var SVN_HOME:File;
 		public var PLAYERGLOBAL_HOME:File;

diff --git a/InstallerSharedCore/src/helperResources/data/moonshineHelperConfig.xml b/InstallerSharedCore/src/helperResources/data/moonshineHelperConfig.xml
@@ -82,6 +82,12 @@
 			<image></image>
 			<componentDependencyIDs>git</componentDependencyIDs>
 		</item>
+		<item integrated="false">
+			<title>Gradle Integration</title>
+			<description><![CDATA[Enable builds and editor enhancements for Gradle projects]]></description>
+			<image></image>
+			<componentDependencyIDs>gradle</componentDependencyIDs>
+		</item>
 		<item integrated="false">
 			<title>PrimeFaces Project Preview</title>
 			<description><![CDATA[Preview PrimeFaces interfaces in browser using lightweight Payara server]]></description>
@@ -253,13 +259,13 @@
 			<sdkType>gradle</sdkType> <!-- flex, flexjs, royale, ant, openjava, maven, feathers -->
 			<website>https://gradle.org</website>
 			<diskMBusage>
-				<windows>83</windows>
-				<mac>10</mac>
+				<windows>95</windows>
+				<mac>95</mac>
 			</diskMBusage>
 			<license>
-				<url>https://gradle.com/legal/gradle-enterprise-software-agreement/</url>
-				<title>Gradle Enterprise Software Agreement</title>
-				<description>Effective starting: Apr 10, 2019 This Gradle Enterprise Agreement (the "Agreement") is between you and Gradle Inc., a Delaware corporation with its principal place of business at 325 9th Street, San Francisco, CA 94103("Gradle").</description>
+				<url>https://github.com/gradle/gradle/blob/master/LICENSE</url>
+				<title>The Apache License Version 2.0</title>
+				<description>The Apache License Version 2.0 applies to all releases of Gradle</description>
 			</license>
 			<download>
 				<windows>