From 00d7938174bcd813eed27c7283b97f426818f4e2 Mon Sep 17 00:00:00 2001 From: hogliux Date: Thu, 26 Oct 2017 15:38:23 +0100 Subject: [PATCH] Android: Updated Android exporter to support Android Studio 3.0 --- .../ProjectSaving/jucer_ProjectExport_Android.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index c9d66f10d0..08291e13b6 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -146,10 +146,10 @@ public: androidKeyStorePass (settings, Ids::androidKeyStorePass, nullptr, "android"), androidKeyAlias (settings, Ids::androidKeyAlias, nullptr, "androiddebugkey"), androidKeyAliasPass (settings, Ids::androidKeyAliasPass, nullptr, "android"), - gradleVersion (settings, Ids::gradleVersion, nullptr, "3.3"), - androidPluginVersion (settings, Ids::androidPluginVersion, nullptr, "2.3.3"), + gradleVersion (settings, Ids::gradleVersion, nullptr, "4.1"), + androidPluginVersion (settings, Ids::androidPluginVersion, nullptr, "3.0.0"), gradleToolchain (settings, Ids::gradleToolchain, nullptr, "clang"), - buildToolsVersion (settings, Ids::buildToolsVersion, nullptr, "26.0.0"), + buildToolsVersion (settings, Ids::buildToolsVersion, nullptr, "27.0.0"), AndroidExecutable (findAndroidExecutable()) { name = getName(); @@ -545,6 +545,7 @@ private: mo << "buildscript {" << newLine; mo << " repositories {" << newLine; mo << " jcenter()" << newLine; + mo << " google()" << newLine; mo << " }" << newLine; mo << " dependencies {" << newLine; mo << " classpath 'com.android.tools.build:gradle:" << androidPluginVersion.get() << "'" << newLine; @@ -606,6 +607,7 @@ private: { MemoryOutputStream mo; + mo << " flavorDimensions \"default\"" << newLine; mo << " productFlavors {" << newLine; for (ConstConfigIterator config (*this); config.next();) @@ -635,7 +637,8 @@ private: << (cfg.isLinkTimeOptimisationEnabled() ? ", " + cfg.getLinkerFlagsString() : "") << newLine; mo << " }" << newLine; - mo << " }" << newLine; + mo << " }" << newLine << newLine; + mo << " dimension \"default\"" << newLine; mo << " }" << newLine; }