diff --git a/examples/DemoRunner/Builds/Android/app/build.gradle b/examples/DemoRunner/Builds/Android/app/build.gradle
index 42bd5c5e53..6fd373d1b8 100644
--- a/examples/DemoRunner/Builds/Android/app/build.gradle
+++ b/examples/DemoRunner/Builds/Android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 def ndkVersionString = "26.2.11394342"
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     ndkVersion ndkVersionString
     namespace "com.rmsl.jucedemorunner"
     externalNativeBuild {
diff --git a/examples/DemoRunner/Builds/Android/build.gradle b/examples/DemoRunner/Builds/Android/build.gradle
index 7d399abf4a..2acae25a9f 100644
--- a/examples/DemoRunner/Builds/Android/build.gradle
+++ b/examples/DemoRunner/Builds/Android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:7.4.2'
+       classpath 'com.android.tools.build:gradle:8.4.1'
    }
 }
 
diff --git a/examples/DemoRunner/Builds/Android/gradle.properties b/examples/DemoRunner/Builds/Android/gradle.properties
new file mode 100644
index 0000000000..5bac8ac504
--- /dev/null
+++ b/examples/DemoRunner/Builds/Android/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 3a542b5b37..94fcab2b68 100644
--- a/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-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 27732b2e7a..a71289ecb0 100644
--- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
+++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 def ndkVersionString = "26.2.11394342"
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     ndkVersion ndkVersionString
     namespace "com.juce.audioperformancetest"
     externalNativeBuild {
diff --git a/extras/AudioPerformanceTest/Builds/Android/build.gradle b/extras/AudioPerformanceTest/Builds/Android/build.gradle
index 7d399abf4a..2acae25a9f 100644
--- a/extras/AudioPerformanceTest/Builds/Android/build.gradle
+++ b/extras/AudioPerformanceTest/Builds/Android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:7.4.2'
+       classpath 'com.android.tools.build:gradle:8.4.1'
    }
 }
 
diff --git a/extras/AudioPerformanceTest/Builds/Android/gradle.properties b/extras/AudioPerformanceTest/Builds/Android/gradle.properties
new file mode 100644
index 0000000000..5bac8ac504
--- /dev/null
+++ b/extras/AudioPerformanceTest/Builds/Android/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 3a542b5b37..94fcab2b68 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-8.2-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
\ No newline at end of file
diff --git a/extras/AudioPluginHost/Builds/Android/app/build.gradle b/extras/AudioPluginHost/Builds/Android/app/build.gradle
index 681f54fce9..f62cb360d8 100644
--- a/extras/AudioPluginHost/Builds/Android/app/build.gradle
+++ b/extras/AudioPluginHost/Builds/Android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 def ndkVersionString = "26.2.11394342"
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     ndkVersion ndkVersionString
     namespace "com.juce.audiopluginhost"
     externalNativeBuild {
diff --git a/extras/AudioPluginHost/Builds/Android/build.gradle b/extras/AudioPluginHost/Builds/Android/build.gradle
index 7d399abf4a..2acae25a9f 100644
--- a/extras/AudioPluginHost/Builds/Android/build.gradle
+++ b/extras/AudioPluginHost/Builds/Android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:7.4.2'
+       classpath 'com.android.tools.build:gradle:8.4.1'
    }
 }
 
diff --git a/extras/AudioPluginHost/Builds/Android/gradle.properties b/extras/AudioPluginHost/Builds/Android/gradle.properties
new file mode 100644
index 0000000000..5bac8ac504
--- /dev/null
+++ b/extras/AudioPluginHost/Builds/Android/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 3a542b5b37..94fcab2b68 100644
--- a/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
\ No newline at end of file
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
index 97b902ca17..1fa040ad10 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
+++ b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 def ndkVersionString = "26.2.11394342"
 
 android {
-    compileSdkVersion 34
+    compileSdk 34
     ndkVersion ndkVersionString
     namespace "com.juce.networkgraphicsdemo"
     externalNativeBuild {
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/build.gradle b/extras/NetworkGraphicsDemo/Builds/Android/build.gradle
index 7d399abf4a..2acae25a9f 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/build.gradle
+++ b/extras/NetworkGraphicsDemo/Builds/Android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-       classpath 'com.android.tools.build:gradle:7.4.2'
+       classpath 'com.android.tools.build:gradle:8.4.1'
    }
 }
 
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/gradle.properties b/extras/NetworkGraphicsDemo/Builds/Android/gradle.properties
new file mode 100644
index 0000000000..5bac8ac504
--- /dev/null
+++ b/extras/NetworkGraphicsDemo/Builds/Android/gradle.properties
@@ -0,0 +1 @@
+android.useAndroidX=true
diff --git a/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
index 3a542b5b37..94fcab2b68 100644
--- a/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
+++ b/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
\ No newline at end of file