From f3ea7e2b296527702ecc6cd039e4d84a3bfdad81 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 2 Jul 2019 09:16:06 +0100 Subject: [PATCH] Projucer: Set the project name in Android settings.gradle file --- .../jucer_ProjectExport_Android.h | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index 918b8866d0..6b27e54d7a 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -116,7 +116,7 @@ public: androidCustomActivityClass (settings, Ids::androidCustomActivityClass, getUndoManager()), androidCustomApplicationClass (settings, Ids::androidCustomApplicationClass, getUndoManager(), getDefaultApplicationClass()), androidManifestCustomXmlElements (settings, Ids::androidManifestCustomXmlElements, getUndoManager()), - androidGradleSettingsContent (settings, Ids::androidGradleSettingsContent, getUndoManager(), isLibrary() ? "include ':lib'" : "include ':app'"), + androidGradleSettingsContent (settings, Ids::androidGradleSettingsContent, getUndoManager()), androidVersionCode (settings, Ids::androidVersionCode, getUndoManager(), "1"), androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"), androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "28"), @@ -195,7 +195,7 @@ public: removeOldFiles (targetFolder); copyExtraResourceFiles(); - writeFile (targetFolder, "settings.gradle", androidGradleSettingsContent.get().toString()); + writeFile (targetFolder, "settings.gradle", getGradleSettingsFileContent()); writeFile (targetFolder, "build.gradle", getProjectBuildGradleFileContent()); writeFile (appFolder, "build.gradle", getAppBuildGradleFileContent (modules)); writeFile (targetFolder, "local.properties", getLocalPropertiesFileContent()); @@ -550,6 +550,22 @@ private: } //============================================================================== + String getGradleSettingsFileContent() const + { + MemoryOutputStream mo; + mo.setNewLineString ("\n"); + + mo << "rootProject.name = " << "\'" << projectName << "\'" << newLine; + mo << (isLibrary() ? "include ':lib'" : "include ':app'"); + + auto extraContent = androidGradleSettingsContent.get().toString(); + + if (extraContent.isNotEmpty()) + mo << newLine << extraContent << newLine; + + return mo.toString(); + } + String getProjectBuildGradleFileContent() const { MemoryOutputStream mo;