From f5c19ef612cc01ac3a051486b341e2ccefedd627 Mon Sep 17 00:00:00 2001
From: Timur Doumler <timur@roli.com>
Date: Tue, 19 Apr 2016 15:20:13 +0100
Subject: [PATCH] Fixed Android build settings of all .jucer files to use new
 default values instead of hard-coded old values (gradle version etc.)

---
 examples/Demo/JuceDemo.jucer                  | 19 +++++++------------
 examples/MidiTest/MidiTest.jucer              | 11 ++++-------
 .../NetworkGraphicsDemo.jucer                 | 11 ++++-------
 examples/OSCReceiver/OSCReceiver.jucer        | 12 +++++-------
 examples/OSCSender/OSCSender.jucer            | 12 ++++--------
 .../AudioPerformanceTest.jucer                | 13 +++++--------
 6 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer
index a04601c89d..24bdb1bcf3 100644
--- a/examples/Demo/JuceDemo.jucer
+++ b/examples/Demo/JuceDemo.jucer
@@ -162,11 +162,9 @@
       </MODULEPATHS>
     </VS2015>
     <ANDROID targetFolder="Builds/Android" androidActivityClass="com.juce.jucedemo.JuceDemo"
-             androidSDKPath="" androidNDKPath="" androidMinimumSDK="23" androidInternetNeeded="1"
-             androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-             androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
+             androidSDKPath="" androidNDKPath="" androidInternetNeeded="1"
              androidMicNeeded="1" bigIcon="xycKOk" androidCpp11="1" smallIcon="BvyE0d"
-             androidVersionCode="1" androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar"
+             androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar"
              androidScreenOrientation="unspecified">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
@@ -192,14 +190,11 @@
         <MODULEPATH id="juce_box2d" path="../../modules"/>
       </MODULEPATHS>
     </ANDROID>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.jucedemo.JuceDemo"
-                   androidMinimumSDK="23" androidInternetNeeded="1" androidKeyStore="${user.home}/.android/debug.keystore"
-                   androidKeyStorePass="android" androidKeyAlias="androiddebugkey"
-                   androidKeyAliasPass="android" androidCpp11="1" targetFolder="Builds/AndroidStudio"
-                   androidSDKPath="" androidNDKPath="" androidBluetoothNeeded="1"
-                   bigIcon="BvyE0d" androidScreenOrientation="unspecified" androidMicNeeded="1"
-                   gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
-                   gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
+    <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1"
+                   androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
+                   androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d"
+                   androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang"
+                   gradleToolchainVersion="3.6" buildToolsVersion="23.0.1" androidTheme="@android:style/Theme.NoTitleBar">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
                        targetName="JuceDemo"/>
diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer
index 0f3ba9e31a..5fd0bef8e4 100644
--- a/examples/MidiTest/MidiTest.jucer
+++ b/examples/MidiTest/MidiTest.jucer
@@ -99,13 +99,10 @@
         <MODULEPATH id="juce_audio_basics" path="../../modules"/>
       </MODULEPATHS>
     </XCODE_IPHONE>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.miditest.MidiTest"
-                   androidMinimumSDK="23" androidInternetNeeded="0" androidBluetoothNeeded="1"
-                   androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-                   androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
-                   androidCpp11="1" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
-                   androidSDKPath="" androidNDKPath="" androidMicNeeded="1" gradleVersion="2.10"
-                   gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
+    <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0"
+                   androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified"
+                   targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
+                   androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"
                    buildToolsVersion="23.0.1">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
index 4a0f0e2563..10e7f378fe 100644
--- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
+++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
@@ -112,13 +112,10 @@
         <MODULEPATH id="juce_audio_basics" path="../../modules"/>
       </MODULEPATHS>
     </LINUX_MAKE>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
-                   androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1"
-                   androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-                   androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
-                   androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
-                   androidNDKPath="" bigIcon="Ww6bQw" androidScreenOrientation="unspecified"
-                   gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
+    <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
+                   androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
+                   targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
+                   bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang"
                    gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer
index eeba33c93a..3437ef7f17 100644
--- a/examples/OSCReceiver/OSCReceiver.jucer
+++ b/examples/OSCReceiver/OSCReceiver.jucer
@@ -82,13 +82,11 @@
         <MODULEPATH id="juce_core" path="../../modules"/>
       </MODULEPATHS>
     </XCODE_IPHONE>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
-                   androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1"
-                   androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-                   androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
-                   androidCpp11="1" targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified"
-                   gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
-                   gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
+    <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
+                   androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
+                   targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified"
+                   gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"
+                   androidSDKPath="" androidNDKPath="">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="1" targetName="OSCReceiver"/>
diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer
index f2dbcadc8b..e9eedcf368 100644
--- a/examples/OSCSender/OSCSender.jucer
+++ b/examples/OSCSender/OSCSender.jucer
@@ -74,14 +74,10 @@
         <MODULEPATH id="juce_core" path="../../modules"/>
       </MODULEPATHS>
     </XCODE_IPHONE>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.oscsender.OSCSender"
-                   androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1"
-                   androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-                   androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
-                   androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
-                   androidNDKPath="" androidScreenOrientation="unspecified" gradleVersion="2.10"
-                   gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
-                   buildToolsVersion="23.0.1">
+    <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1"
+                   androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio"
+                   androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified"
+                   gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
                        optimisation="1" targetName="OSCSender"/>
diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
index 4676fa81d3..3bddfeb82f 100644
--- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
+++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer
@@ -94,15 +94,12 @@
         <MODULEPATH id="juce_audio_utils" path="../../modules"/>
       </MODULEPATHS>
     </LINUX_MAKE>
-    <ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
-                   androidMinimumSDK="23" androidInternetNeeded="1" androidBluetoothNeeded="1"
-                   androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
-                   androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
-                   androidCpp11="1" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
+    <ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
+                   androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
+                   androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
                    androidSDKPath="" androidNDKPath="" extraCompilerFlags="-mfpu=neon -mfloat-abi=hard -ffast-math -funroll-loops --param max-unroll-times=8 -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -DJUCE_DISABLE_ASSERTIONS=1"
-                   extraDefs="" extraLinkerFlags="" externalLibraries="" gradleVersion="2.10"
-                   gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
-                   buildToolsVersion="23.0.1">
+                   extraDefs="" extraLinkerFlags="" externalLibraries="" gradleToolchain="clang"
+                   gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
       <CONFIGURATIONS>
         <CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" optimisation="1"
                        targetName="AudioPerformanceTest"/>