mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Projucer: Update default gradle plugin version

Browse source
This commit is contained in:
reuk 2022-09-27 18:30:34 +01:00
parent e7c2d7bda3
commit 215dec411d
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -139,7 +139,7 @@ public:
androidKeyAliasPass (settings, Ids::androidKeyAliasPass, getUndoManager(), "android"), androidKeyAliasPass (settings, Ids::androidKeyAliasPass, getUndoManager(), "android"),
gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.5.1"), gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.5.1"),
gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"), gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"),
androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.2.2"), androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.3.0"),
AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString()) AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString())
{ {
name = getDisplayName(); name = getDisplayName();
@ -642,6 +642,7 @@ private:
mo << "android {" << newLine; mo << "android {" << newLine;
mo << " compileSdkVersion " << static_cast<int> (androidTargetSDK.get()) << newLine; mo << " compileSdkVersion " << static_cast<int> (androidTargetSDK.get()) << newLine;
mo << " namespace " << project.getBundleIdentifierString().toLowerCase().quoted() << newLine;
mo << " externalNativeBuild {" << newLine; mo << " externalNativeBuild {" << newLine;
mo << " cmake {" << newLine; mo << " cmake {" << newLine;
mo << " path \"CMakeLists.txt\"" << newLine; mo << " path \"CMakeLists.txt\"" << newLine;
@ -1641,7 +1642,6 @@ private:
setAttributeIfNotPresent (*manifest, "xmlns:android", "http://schemas.android.com/apk/res/android"); setAttributeIfNotPresent (*manifest, "xmlns:android", "http://schemas.android.com/apk/res/android");
setAttributeIfNotPresent (*manifest, "android:versionCode", androidVersionCode.get()); setAttributeIfNotPresent (*manifest, "android:versionCode", androidVersionCode.get());
setAttributeIfNotPresent (*manifest, "android:versionName", project.getVersionString()); setAttributeIfNotPresent (*manifest, "android:versionName", project.getVersionString());
setAttributeIfNotPresent (*manifest, "package", project.getBundleIdentifierString().toLowerCase());
return manifest; return manifest;
} }
@ -1734,7 +1734,6 @@ private:
auto* act = getOrCreateChildWithName (application, "activity"); auto* act = getOrCreateChildWithName (application, "activity");
setAttributeIfNotPresent (*act, "android:name", getActivityClassString()); setAttributeIfNotPresent (*act, "android:name", getActivityClassString());
setAttributeIfNotPresent (*act, "android:label", "@string/app_name");
if (! act->hasAttribute ("android:configChanges")) if (! act->hasAttribute ("android:configChanges"))
act->setAttribute ("android:configChanges", "keyboardHidden|orientation|screenSize"); act->setAttribute ("android:configChanges", "keyboardHidden|orientation|screenSize");