diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index 82037c24d7..90cb1bb10e 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -97,7 +97,7 @@ public: //============================================================================== ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidRepositories, androidDependencies, androidScreenOrientation, - androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidVersionCode, + androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidGradleSettingsContent, androidVersionCode, androidMinimumSDK, androidTargetSDK, androidTheme, androidSharedLibraries, androidStaticLibraries, androidExtraAssetsFolder, androidOboeRepositoryPath, androidInternetNeeded, androidMicNeeded, androidCameraNeeded, androidBluetoothNeeded, androidExternalReadPermission, androidExternalWritePermission, androidInAppBillingPermission, androidVibratePermission, androidOtherPermissions, @@ -116,6 +116,7 @@ public: androidCustomActivityClass (settings, Ids::androidCustomActivityClass, getUndoManager(), getDefaultActivityClass()), androidCustomApplicationClass (settings, Ids::androidCustomApplicationClass, getUndoManager(), getDefaultApplicationClass()), androidManifestCustomXmlElements (settings, Ids::androidManifestCustomXmlElements, getUndoManager()), + androidGradleSettingsContent (settings, Ids::androidGradleSettingsContent, getUndoManager(), isLibrary() ? "include ':lib'" : "include ':app'"), androidVersionCode (settings, Ids::androidVersionCode, getUndoManager(), "1"), androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "16"), androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "28"), @@ -204,7 +205,7 @@ public: removeOldFiles (targetFolder); copyExtraResourceFiles(); - writeFile (targetFolder, "settings.gradle", isLibrary() ? "include ':lib'" : "include ':app'"); + writeFile (targetFolder, "settings.gradle", androidGradleSettingsContent.get().toString()); writeFile (targetFolder, "build.gradle", getProjectBuildGradleFileContent()); writeFile (appFolder, "build.gradle", getAppBuildGradleFileContent (modules)); writeFile (targetFolder, "local.properties", getLocalPropertiesFileContent()); @@ -990,6 +991,9 @@ private: "If adding any java libs in \"Java libraries to include\" setting, do not add them here as " "they will be added automatically."); + props.add (new TextPropertyComponent (androidGradleSettingsContent, "Custom gradle.settings content", 32768, true), + "You can customize the content of settings.gradle here"); + props.add (new ChoicePropertyComponent (androidScreenOrientation, "Screen Orientation", { "Portrait and Landscape", "Portrait", "Landscape" }, { "unspecified", "portrait", "landscape" }), diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h index 9a7d3b12d7..592cc63a77 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h @@ -213,6 +213,7 @@ namespace Ids DECLARE_ID (androidInternetNeeded); DECLARE_ID (androidArchitectures); DECLARE_ID (androidManifestCustomXmlElements); + DECLARE_ID (androidGradleSettingsContent); DECLARE_ID (androidCustomStringXmlElements); DECLARE_ID (androidBluetoothNeeded); DECLARE_ID (androidExternalReadNeeded);