Merge branch 'master' of github.com:NativeScript/nativescript-cli

Author: farfromrefug

lib/services/android-plugin-build-service.ts

@@ -374,7 +374,8 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		);
 		const allGradleTemplateFiles = path.join(gradleTemplatePath, "*");
 		const buildGradlePath = path.join(pluginTempDir, "build.gradle");
-
+		const settingsGradlePath = path.join(pluginTempDir, "settings.gradle");
+		
 		this.$fs.copyFile(allGradleTemplateFiles, pluginTempDir);
 		const runtimeGradleVersions = await this.getRuntimeGradleVersions(
 			projectDir
@@ -384,6 +385,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			runtimeGradleVersions.gradleVersion
 		);
 		this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
+		this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
 	}
 
 	private async getRuntimeGradleVersions(

lib/services/platform-environment-requirements.ts

@@ -152,9 +152,11 @@ export class PlatformEnvironmentRequirements
 			darwin: "macos",
 		} as any)[process.platform];
 
+		const anchor = platform ? `#${os}-${platform.toLowerCase()}` : ''
+
 		return (
 			`Verify that your environment is configured according to the system requirements described at\n` +
-			`https://docs.nativescript.org/environment-setup.html#${os}-${platform.toLowerCase()}.`
+			`https://docs.nativescript.org/environment-setup.html${anchor}.`
 		);
 	}
 

vendor/gradle-plugin/settings.gradle

@@ -1 +1,25 @@
+import groovy.json.JsonSlurper
 
+def USER_PROJECT_ROOT = "$rootDir/../../../"
+def PLATFORMS_ANDROID = "platforms/android"
+def PLUGIN_NAME = "{{pluginName}}"
+
+def dependenciesJson = file("${USER_PROJECT_ROOT}/${PLATFORMS_ANDROID}/dependencies.json")
+def appDependencies = new JsonSlurper().parseText(dependenciesJson.text)
+def pluginData = appDependencies.find { it.name == PLUGIN_NAME }
+def nativescriptDependencies = appDependencies.findAll{pluginData.name == it.name}
+
+def getDepPlatformDir = { dep ->
+        file("$USER_PROJECT_ROOT/$PLATFORMS_ANDROID/${dep.directory}/$PLATFORMS_ANDROID")
+}
+
+def applyIncludeSettingsGradlePlugin = {
+     nativescriptDependencies.each { dep ->
+            def includeSettingsGradlePath = "${getDepPlatformDir(dep)}/include-settings.gradle"
+            if (file(includeSettingsGradlePath).exists()) {
+                apply from: includeSettingsGradlePath
+            }
+    }
+}
+
+applyIncludeSettingsGradlePlugin()