From 09e4ca57c58a5c2af8de91f313a7c9e1f11e7b97 Mon Sep 17 00:00:00 2001
From: Timur Doumler <timur@roli.com>
Date: Mon, 14 Dec 2015 15:23:33 +0000
Subject: [PATCH] Added Android Studio exporter build tools option.

---
 .../jucer_ProjectExport_AndroidStudio.h       | 25 ++++++++++++++++---
 .../Source/Utility/jucer_PresetIDs.h          |  1 +
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h
index cb08c32fc9..960e6e89e1 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
@@ -79,11 +79,17 @@ public:
 
         props.add (new TextPropertyComponent (getNDKPlatformVersionValue(), "NDK Platform Version", 32, false),
                    "The value to use for android$user.ndk.platformVersion in Gradle");
+
+        props.add (new TextPropertyComponent (getBuildToolsVersionValue(), "Build Tools Version", 32, false),
+                   "The version of build tools use for build tools in Gradle");
     }
 
-    Value getNDKPlatformVersionValue() { return getSetting (Ids::androidNdkPlatformVersion); }
+    Value getNDKPlatformVersionValue()         { return getSetting (Ids::androidNdkPlatformVersion); }
     String getNDKPlatformVersionString() const { return settings [Ids::androidNdkPlatformVersion]; }
 
+    Value getBuildToolsVersionValue()          { return getSetting (Ids::buildToolsVersion); }
+    String getBuildToolsVersionString() const  { return settings [Ids::buildToolsVersion]; }
+
     void removeOldFiles (const File& targetFolder) const
     {
         targetFolder.getChildFile ("app/src").deleteRecursively();
@@ -344,13 +350,16 @@ private:
         writeXmlOrThrow (*manifest, folder.getChildFile ("app/src/main/AndroidManifest.xml"), "utf-8", 100, true);
     }
 
-    String createModelDotAndroid (const String& indent, const String& minimumSDKVersion, const String& bundleIdentifier) const
+    String createModelDotAndroid (const String& indent,
+                                  const String& minimumSDKVersion,
+                                  const String& buildToolsVersion,
+                                  const String& bundleIdentifier) const
     {
         String result;
 
         result << "android {" << newLine
                << indent << "compileSdkVersion = " << minimumSDKVersion << newLine
-               << indent << "buildToolsVersion = \"" << "23.0.1" << "\"" << newLine
+               << indent << "buildToolsVersion = \"" << buildToolsVersion << "\"" << newLine
                << indent << "defaultConfig.with {" << newLine
                << indent << indent << "applicationId = \"" << bundleIdentifier.toLowerCase() << "\"" << newLine
                << indent << indent << "minSdkVersion.apiLevel = " << minimumSDKVersion << newLine
@@ -621,10 +630,18 @@ private:
         const String minimumSDKVersion = getMinimumSDKVersionString();
         const String bundleIdentifier  = project.getBundleIdentifier().toString();
 
+        String buildToolsVersion = getBuildToolsVersionString();
+
+        if (buildToolsVersion.isEmpty())
+            buildToolsVersion = "23.0.1";
+
         memoryOutputStream << "apply plugin: 'com.android.model.application'" << newLine
                            << newLine
                            << "model {" << newLine
-                           << CodeHelpers::indent (createModelDotAndroid (indent, minimumSDKVersion, bundleIdentifier), indent.length(), true)
+                           << CodeHelpers::indent (createModelDotAndroid (indent,
+                                                                          minimumSDKVersion,
+                                                                          buildToolsVersion,
+                                                                          bundleIdentifier), indent.length(), true)
                            << newLine
                            << CodeHelpers::indent (createModelDotCompileOptions (indent), indent.length(), true)
                            << newLine
diff --git a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
index fbd4007058..e2686b4756 100644
--- a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
+++ b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
@@ -156,6 +156,7 @@ namespace Ids
     DECLARE_ID (androidStaticLibraries);
     DECLARE_ID (androidSharedLibraries);
     DECLARE_ID (androidNdkPlatformVersion);
+    DECLARE_ID (buildToolsVersion);
     DECLARE_ID (font);
     DECLARE_ID (colour);
     DECLARE_ID (userNotes);