From 455b8baf7e5a7f3b95dbf043e974e69b6a09a80e Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 29 Jul 2021 12:46:21 +0100 Subject: [PATCH] Projucer: Update Android plug-in and gradle versions --- .../jucer_ProjectExport_Android.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index a33b228dfb..5e5f046fbf 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -90,12 +90,15 @@ public: } //============================================================================== - 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, - androidPushNotifications, androidEnableRemoteNotifications, androidRemoteNotificationsConfigFile, androidEnableContentSharing, androidKeyStore, androidKeyStorePass, - androidKeyAlias, androidKeyAliasPass, gradleVersion, gradleToolchain, androidPluginVersion; + 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, androidPushNotifications, + androidEnableRemoteNotifications, androidRemoteNotificationsConfigFile, androidEnableContentSharing, androidKeyStore, + androidKeyStorePass, androidKeyAlias, androidKeyAliasPass, gradleVersion, gradleToolchain, androidPluginVersion; //============================================================================== AndroidProjectExporter (Project& p, const ValueTree& t) @@ -135,9 +138,9 @@ public: androidKeyStorePass (settings, Ids::androidKeyStorePass, getUndoManager(), "android"), androidKeyAlias (settings, Ids::androidKeyAlias, getUndoManager(), "androiddebugkey"), androidKeyAliasPass (settings, Ids::androidKeyAliasPass, getUndoManager(), "android"), - gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "6.7.1"), + gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "7.0.2"), gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"), - androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "4.2.1"), + androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "7.0.0"), AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString()) { name = getDisplayName();