From 1cb3511793e5f41cf8662cd1b5f3be828fecc8e7 Mon Sep 17 00:00:00 2001
From: hogliux <fabian.renn@gmail.com>
Date: Fri, 3 Nov 2017 11:00:07 +0000
Subject: [PATCH] Re-saved all projects

---
 .../AnalyticsCollection/Builds/Android/app/build.gradle    | 7 ++++++-
 examples/AnalyticsCollection/Builds/Android/build.gradle   | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/Demo/Builds/Android/app/build.gradle              | 7 ++++++-
 .../Demo/Builds/Android/app/src/main/AndroidManifest.xml   | 3 +++
 examples/Demo/Builds/Android/build.gradle                  | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/InAppPurchase/Builds/Android/app/build.gradle     | 7 ++++++-
 examples/InAppPurchase/Builds/Android/build.gradle         | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/MidiTest/Builds/Android/app/build.gradle          | 7 ++++++-
 examples/MidiTest/Builds/Android/build.gradle              | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 .../NetworkGraphicsDemo/Builds/Android/app/build.gradle    | 7 ++++++-
 examples/NetworkGraphicsDemo/Builds/Android/build.gradle   | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/OSCReceiver/Builds/Android/app/build.gradle       | 7 ++++++-
 examples/OSCReceiver/Builds/Android/build.gradle           | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/OSCSender/Builds/Android/app/build.gradle         | 7 ++++++-
 examples/OSCSender/Builds/Android/build.gradle             | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 .../PushNotificationsDemo/Builds/Android/app/build.gradle  | 7 ++++++-
 examples/PushNotificationsDemo/Builds/Android/build.gradle | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 examples/audio plugin demo/Builds/Android/app/build.gradle | 7 ++++++-
 examples/audio plugin demo/Builds/Android/build.gradle     | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 .../AudioPerformanceTest/Builds/Android/app/build.gradle   | 7 ++++++-
 extras/AudioPerformanceTest/Builds/Android/build.gradle    | 3 ++-
 .../Android/gradle/wrapper/gradle-wrapper.properties       | 2 +-
 31 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/examples/AnalyticsCollection/Builds/Android/app/build.gradle b/examples/AnalyticsCollection/Builds/Android/app/build.gradle
index 89b700d824..04072da9ab 100644
--- a/examples/AnalyticsCollection/Builds/Android/app/build.gradle
+++ b/examples/AnalyticsCollection/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/AnalyticsCollection/Builds/Android/build.gradle b/examples/AnalyticsCollection/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/AnalyticsCollection/Builds/Android/build.gradle
+++ b/examples/AnalyticsCollection/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/AnalyticsCollection/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/AnalyticsCollection/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/AnalyticsCollection/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/AnalyticsCollection/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/Demo/Builds/Android/app/build.gradle b/examples/Demo/Builds/Android/app/build.gradle
index 3a36b0f4c5..4f2b7ec282 100644
--- a/examples/Demo/Builds/Android/app/build.gradle
+++ b/examples/Demo/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/Demo/Builds/Android/app/src/main/AndroidManifest.xml b/examples/Demo/Builds/Android/app/src/main/AndroidManifest.xml
index 0819542f10..5d5e2b52ba 100644
--- a/examples/Demo/Builds/Android/app/src/main/AndroidManifest.xml
+++ b/examples/Demo/Builds/Android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,9 @@
   <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+  <uses-permission android:name="android.permission.BLUETOOTH"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
diff --git a/examples/Demo/Builds/Android/build.gradle b/examples/Demo/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/Demo/Builds/Android/build.gradle
+++ b/examples/Demo/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/Demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/Demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/Demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/Demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/InAppPurchase/Builds/Android/app/build.gradle b/examples/InAppPurchase/Builds/Android/app/build.gradle
index 977e5c8c06..51cf12f394 100644
--- a/examples/InAppPurchase/Builds/Android/app/build.gradle
+++ b/examples/InAppPurchase/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/InAppPurchase/Builds/Android/build.gradle b/examples/InAppPurchase/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/InAppPurchase/Builds/Android/build.gradle
+++ b/examples/InAppPurchase/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/InAppPurchase/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/InAppPurchase/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/InAppPurchase/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/InAppPurchase/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/MidiTest/Builds/Android/app/build.gradle b/examples/MidiTest/Builds/Android/app/build.gradle
index a5e922831c..09823509e6 100644
--- a/examples/MidiTest/Builds/Android/app/build.gradle
+++ b/examples/MidiTest/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/MidiTest/Builds/Android/build.gradle b/examples/MidiTest/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/MidiTest/Builds/Android/build.gradle
+++ b/examples/MidiTest/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/MidiTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/MidiTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/MidiTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/MidiTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle
index 2a4f68bbf6..01d87255a1 100644
--- a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle
+++ b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-Ofast", "-DCMAKE_C_FLAGS_DEBUG=-Ofast"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/NetworkGraphicsDemo/Builds/Android/build.gradle b/examples/NetworkGraphicsDemo/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/NetworkGraphicsDemo/Builds/Android/build.gradle
+++ b/examples/NetworkGraphicsDemo/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/OSCReceiver/Builds/Android/app/build.gradle b/examples/OSCReceiver/Builds/Android/app/build.gradle
index 13a6c1fc00..661969e574 100644
--- a/examples/OSCReceiver/Builds/Android/app/build.gradle
+++ b/examples/OSCReceiver/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/OSCReceiver/Builds/Android/build.gradle b/examples/OSCReceiver/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/OSCReceiver/Builds/Android/build.gradle
+++ b/examples/OSCReceiver/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/OSCReceiver/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/OSCReceiver/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/OSCReceiver/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/OSCReceiver/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/OSCSender/Builds/Android/app/build.gradle b/examples/OSCSender/Builds/Android/app/build.gradle
index 7f484153d8..d87b6d2fda 100644
--- a/examples/OSCSender/Builds/Android/app/build.gradle
+++ b/examples/OSCSender/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 10
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/OSCSender/Builds/Android/build.gradle b/examples/OSCSender/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/OSCSender/Builds/Android/build.gradle
+++ b/examples/OSCSender/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/OSCSender/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/OSCSender/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/OSCSender/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/OSCSender/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/PushNotificationsDemo/Builds/Android/app/build.gradle b/examples/PushNotificationsDemo/Builds/Android/app/build.gradle
index 4ce61d4ddb..4223eb37a9 100644
--- a/examples/PushNotificationsDemo/Builds/Android/app/build.gradle
+++ b/examples/PushNotificationsDemo/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/PushNotificationsDemo/Builds/Android/build.gradle b/examples/PushNotificationsDemo/Builds/Android/build.gradle
index 9e9971f90f..b9e1579875 100644
--- a/examples/PushNotificationsDemo/Builds/Android/build.gradle
+++ b/examples/PushNotificationsDemo/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
        classpath 'com.google.gms:google-services:3.1.0'
    }
 }
diff --git a/examples/PushNotificationsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/PushNotificationsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/PushNotificationsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/PushNotificationsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/examples/audio plugin demo/Builds/Android/app/build.gradle b/examples/audio plugin demo/Builds/Android/app/build.gradle
index e425b13245..6d1d9db5ad 100644
--- a/examples/audio plugin demo/Builds/Android/app/build.gradle	
+++ b/examples/audio plugin demo/Builds/Android/app/build.gradle	
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             externalNativeBuild {
@@ -63,6 +66,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/examples/audio plugin demo/Builds/Android/build.gradle b/examples/audio plugin demo/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/examples/audio plugin demo/Builds/Android/build.gradle	
+++ b/examples/audio plugin demo/Builds/Android/build.gradle	
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/examples/audio plugin demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/audio plugin demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/examples/audio plugin demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties	
+++ b/examples/audio plugin demo/Builds/Android/gradle/wrapper/gradle-wrapper.properties	
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file
diff --git a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
index 71b86b8d8f..ce3dacaa1b 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
+++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "27.0.0"
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -46,6 +46,7 @@ android {
          }
     }
 
+    flavorDimensions "default"
     productFlavors {
         debug_ {
             ndk {
@@ -56,6 +57,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0"
                 }
             }
+
+            dimension "default"
        }
         release_ {
             ndk {
@@ -66,6 +69,8 @@ android {
                     arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-Ofast", "-DCMAKE_C_FLAGS_RELEASE=-Ofast"
                 }
             }
+
+            dimension "default"
        }
     }
 
diff --git a/extras/AudioPerformanceTest/Builds/Android/build.gradle b/extras/AudioPerformanceTest/Builds/Android/build.gradle
index 0109eaa02a..cf46c8cea9 100644
--- a/extras/AudioPerformanceTest/Builds/Android/build.gradle
+++ b/extras/AudioPerformanceTest/Builds/Android/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
    repositories {
        jcenter()
+       google()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:2.3.3'
+       classpath 'com.android.tools.build:gradle:3.0.0'
    }
 }
 
diff --git a/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 69aae7dc33..6654a817a2 100644
--- a/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file