diff --git a/examples/DemoRunner/Builds/Android/app/build.gradle b/examples/DemoRunner/Builds/Android/app/build.gradle index 6cabc5f3f7..05f9d101ab 100644 --- a/examples/DemoRunner/Builds/Android/app/build.gradle +++ b/examples/DemoRunner/Builds/Android/app/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.android.application' -def ndkVersionString = "26.2.11394342" +def ndkVersionString = "28.1.13356709" android { - compileSdk 34 + compileSdk 35 ndkVersion ndkVersionString namespace "com.rmsl.jucedemorunner" externalNativeBuild { @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "com.rmsl.jucedemorunner" minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 externalNativeBuild { cmake { arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-24", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_WEAK_API_DEFS=ON", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF" diff --git a/examples/DemoRunner/Builds/Android/build.gradle b/examples/DemoRunner/Builds/Android/build.gradle index 2acae25a9f..0a96edf153 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:8.4.1' + classpath 'com.android.tools.build:gradle:8.10.0' } } diff --git a/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/examples/DemoRunner/Builds/Android/gradle/wrapper/gradle-wrapper.properties index 94fcab2b68..a175cd6c3d 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.6-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.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 36234d96be..33c34a4ea6 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle +++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.android.application' -def ndkVersionString = "26.2.11394342" +def ndkVersionString = "28.1.13356709" android { - compileSdk 34 + compileSdk 35 ndkVersion ndkVersionString namespace "com.juce.audioperformancetest" externalNativeBuild { @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "com.juce.audioperformancetest" minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 externalNativeBuild { cmake { arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-24", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_WEAK_API_DEFS=ON", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF" diff --git a/extras/AudioPerformanceTest/Builds/Android/build.gradle b/extras/AudioPerformanceTest/Builds/Android/build.gradle index 2acae25a9f..0a96edf153 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:8.4.1' + classpath 'com.android.tools.build:gradle:8.10.0' } } diff --git a/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties index 94fcab2b68..a175cd6c3d 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.6-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-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 b54f907550..19ddab8163 100644 --- a/extras/AudioPluginHost/Builds/Android/app/build.gradle +++ b/extras/AudioPluginHost/Builds/Android/app/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.android.application' -def ndkVersionString = "26.2.11394342" +def ndkVersionString = "28.1.13356709" android { - compileSdk 34 + compileSdk 35 ndkVersion ndkVersionString namespace "com.juce.audiopluginhost" externalNativeBuild { @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "com.juce.audiopluginhost" minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 externalNativeBuild { cmake { arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-24", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_WEAK_API_DEFS=ON", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF" diff --git a/extras/AudioPluginHost/Builds/Android/build.gradle b/extras/AudioPluginHost/Builds/Android/build.gradle index 2acae25a9f..0a96edf153 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:8.4.1' + classpath 'com.android.tools.build:gradle:8.10.0' } } diff --git a/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties index 94fcab2b68..a175cd6c3d 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.6-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-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 2249c40f0b..f207b810af 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.android.application' -def ndkVersionString = "26.2.11394342" +def ndkVersionString = "28.1.13356709" android { - compileSdk 34 + compileSdk 35 ndkVersion ndkVersionString namespace "com.juce.networkgraphicsdemo" externalNativeBuild { @@ -25,7 +25,7 @@ android { defaultConfig { applicationId "com.juce.networkgraphicsdemo" minSdkVersion 24 - targetSdkVersion 34 + targetSdkVersion 35 externalNativeBuild { cmake { arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-24", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE", "-DANDROID_WEAK_API_DEFS=ON", "-DCMAKE_CXX_STANDARD=17", "-DCMAKE_CXX_EXTENSIONS=OFF" diff --git a/extras/NetworkGraphicsDemo/Builds/Android/build.gradle b/extras/NetworkGraphicsDemo/Builds/Android/build.gradle index 2acae25a9f..0a96edf153 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:8.4.1' + classpath 'com.android.tools.build:gradle:8.10.0' } } diff --git a/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties b/extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties index 94fcab2b68..a175cd6c3d 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.6-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip \ No newline at end of file diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index a412b4b80a..09a3ebee04 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -132,7 +132,7 @@ public: androidGradleSettingsContent (settings, Ids::androidGradleSettingsContent, getUndoManager()), androidVersionCode (settings, Ids::androidVersionCode, getUndoManager(), "1"), androidMinimumSDK (settings, Ids::androidMinimumSDK, getUndoManager(), "24"), - androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "34"), + androidTargetSDK (settings, Ids::androidTargetSDK, getUndoManager(), "35"), androidTheme (settings, Ids::androidTheme, getUndoManager()), androidExtraAssetsFolder (settings, Ids::androidExtraAssetsFolder, getUndoManager()), androidOboeRepositoryPath (settings, Ids::androidOboeRepositoryPath, getUndoManager()), @@ -157,10 +157,10 @@ public: androidKeyStorePass (settings, Ids::androidKeyStorePass, getUndoManager(), "android"), androidKeyAlias (settings, Ids::androidKeyAlias, getUndoManager(), "androiddebugkey"), androidKeyAliasPass (settings, Ids::androidKeyAliasPass, getUndoManager(), "android"), - gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "8.6"), + gradleVersion (settings, Ids::gradleVersion, getUndoManager(), "8.11.1"), gradleToolchain (settings, Ids::gradleToolchain, getUndoManager(), "clang"), gradleClangTidy (settings, Ids::gradleClangTidy, getUndoManager(), false), - androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "8.4.1"), + androidPluginVersion (settings, Ids::androidPluginVersion, getUndoManager(), "8.10.0"), AndroidExecutable (getAppSettings().getStoredPath (Ids::androidStudioExePath, TargetOS::getThisOS()).get().toString()) { name = getDisplayName(); @@ -171,7 +171,7 @@ public: void createToolchainExporterProperties (PropertyListBuilder& props) { props.add (new TextPropertyComponent (gradleVersion, "Gradle Version", 32, false), - "The version of gradle that is used to build this app (4.10 is fine for JUCE)"); + "The version of gradle that is used to build this app"); props.add (new TextPropertyComponent (androidPluginVersion, "Android Plug-in Version", 32, false), "The version of the android build plugin for gradle that is used to build this app"); @@ -697,7 +697,7 @@ private: mo << "apply plugin: 'com.android." << (isLibrary() ? "library" : "application") << "'" << newLine << newLine; // NDK 26 is required for ANDROID_WEAK_API_DEFS, which is in turn required for weak-linking AFontMatcher - mo << "def ndkVersionString = \"26.2.11394342\"" << newLine << newLine; + mo << "def ndkVersionString = \"28.1.13356709\"" << newLine << newLine; mo << "android {" << newLine; mo << " compileSdk " << static_cast (androidTargetSDK.get()) << newLine;