Browse Source

Projucer: add project level repositories section to Android exporter.

tags/2021-05-28
Lukasz Kozakiewicz 6 years ago
parent
commit
b4617412c2
2 changed files with 28 additions and 13 deletions
  1. +27
    -13
      extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
  2. +1
    -0
      extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h

+ 27
- 13
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h View File

@@ -95,7 +95,7 @@ public:
}
//==============================================================================
ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidRepositories, androidDependencies, androidCustomAppBuildGradleContent,
ValueWithDefault androidJavaLibs, androidAdditionalJavaFolders, androidAdditionalResourceFolders, androidProjectRepositories, androidRepositories, androidDependencies, androidCustomAppBuildGradleContent,
androidScreenOrientation, androidCustomActivityClass, androidCustomApplicationClass, androidManifestCustomXmlElements, androidGradleSettingsContent, androidVersionCode,
androidMinimumSDK, androidTargetSDK, androidTheme, androidExtraAssetsFolder, androidOboeRepositoryPath, androidInternetNeeded, androidMicNeeded, androidCameraNeeded,
androidBluetoothNeeded, androidExternalReadPermission, androidExternalWritePermission, androidInAppBillingPermission, androidVibratePermission, androidOtherPermissions,
@@ -108,6 +108,7 @@ public:
androidJavaLibs (settings, Ids::androidJavaLibs, getUndoManager()),
androidAdditionalJavaFolders (settings, Ids::androidAdditionalJavaFolders, getUndoManager()),
androidAdditionalResourceFolders (settings, Ids::androidAdditionalResourceFolders, getUndoManager()),
androidProjectRepositories (settings, Ids::androidProjectRepositories, getUndoManager(), "google()\njcenter()"),
androidRepositories (settings, Ids::androidRepositories, getUndoManager()),
androidDependencies (settings, Ids::androidDependencies, getUndoManager()),
androidCustomAppBuildGradleContent (settings, Ids::androidCustomAppBuildGradleContent, getUndoManager()),
@@ -567,18 +568,7 @@ private:
mo << "}" << newLine;
mo << "" << newLine;
mo << "allprojects {" << newLine;
mo << " repositories {" << newLine;
mo << " google()" << newLine;
mo << " jcenter()" << newLine;
if (androidEnableRemoteNotifications.get())
{
mo << " maven {" << newLine;
mo << " url \"https://maven.google.com\"" << newLine;
mo << " }" << newLine;
}
mo << " }" << newLine;
mo << getAndroidProjectRepositories();
mo << "}" << newLine;
return mo.toString();
@@ -774,6 +764,26 @@ private:
return mo.toString();
}
String getAndroidProjectRepositories() const
{
MemoryOutputStream mo;
mo.setNewLineString ("\n");
auto repositories = StringArray::fromLines (androidProjectRepositories.get().toString());
if (androidEnableRemoteNotifications.get())
repositories.add ("maven { url \"https://maven.google.com\" }");
mo << " repositories {" << newLine;
for (auto& r : repositories)
mo << " " << r << newLine;
mo << " }" << newLine;
return mo.toString();
}
String getAndroidRepositories() const
{
MemoryOutputStream mo;
@@ -972,6 +982,10 @@ private:
"dependency will be automatically added to module \"dependencies\" section for each library, so do "
"not add the dependency yourself.");
props.add (new TextPropertyComponent (androidProjectRepositories, "Project Repositories", 32768, true),
"Custom project repositories (one per line). These will be used in project-level gradle file "
"\"allprojects { repositories {\" section instead of default ones.");
props.add (new TextPropertyComponent (androidRepositories, "Module Repositories", 32768, true),
"Module repositories (one per line). These will be added to module-level gradle file repositories section. ");


+ 1
- 0
extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h View File

@@ -196,6 +196,7 @@ namespace Ids
DECLARE_ID (androidJavaLibs);
DECLARE_ID (androidAdditionalJavaFolders);
DECLARE_ID (androidAdditionalResourceFolders);
DECLARE_ID (androidProjectRepositories);
DECLARE_ID (androidRepositories);
DECLARE_ID (androidDependencies);
DECLARE_ID (androidCustomAppBuildGradleContent);


Loading…
Cancel
Save