mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Projucer (Android): Update default toolchain versions

Browse source 
Soon, Google Play will require apps targeting API 35+ to be compatible
with 16 KB page sizes, which is achieved by updating the NDK version.
This commit is contained in:
reuk 2025-05-15 11:31:25 +01:00
parent 94fc24e41a
commit 4bdb76158e
No known key found for this signature in database
13 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/AudioPerformanceTest/Builds/Android/app/build.gradle
View file

@ -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"

2
extras/AudioPerformanceTest/Builds/Android/build.gradle
View file

@ -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'
}
}

2
extras/AudioPerformanceTest/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

6
extras/AudioPluginHost/Builds/Android/app/build.gradle
View file

@ -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"

2
extras/AudioPluginHost/Builds/Android/build.gradle
View file

@ -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'
}
}

2
extras/AudioPluginHost/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

6
extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
View file

@ -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"

2
extras/NetworkGraphicsDemo/Builds/Android/build.gradle
View file

@ -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'
}
}

2
extras/NetworkGraphicsDemo/Builds/Android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

10
extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h
View file

@ -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<int> (androidTargetSDK.get()) << newLine;