[Android] gradle: set the build-tools version to the Docker ones
Steve Lhomme
git at videolan.org
Tue Jul 1 08:03:14 UTC 2025
vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 23 11:50:55 2025 +0200| [295073f5a78aab50e4cfd055fa9216fc1a34aeca] | committer: Steve Lhomme
gradle: set the build-tools version to the Docker ones
So we don't have to download them.
> https://code.videolan.org/videolan/vlc-android/commit/295073f5a78aab50e4cfd055fa9216fc1a34aeca
---
application/app/build.gradle | 1 +
application/donations/build.gradle | 1 +
application/live-plot-graph/build.gradle | 1 +
application/mediadb/build.gradle | 1 +
application/moviepedia/build.gradle | 1 +
application/remote-access-client/build.gradle | 1 +
application/remote-access-server/build.gradle | 1 +
application/resources/build.gradle | 1 +
application/television/build.gradle | 1 +
application/tools/build.gradle | 1 +
application/vlc-android/build.gradle | 1 +
build.gradle | 3 ++-
medialibrary/build.gradle | 1 +
13 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index ba616bf967..ed2bbb18d5 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -34,6 +34,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
vectorDrawables.useSupportLibrary = true
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index be14b36153..43f61cd96c 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -43,6 +43,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index 97d6f27eca..10d72f3c49 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -33,6 +33,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 408de4e0ae..43a437548d 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -40,6 +40,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index 749c13eeec..8dfbe1881b 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -21,6 +21,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/remote-access-client/build.gradle b/application/remote-access-client/build.gradle
index 99f6cf32c1..658370828f 100644
--- a/application/remote-access-client/build.gradle
+++ b/application/remote-access-client/build.gradle
@@ -39,6 +39,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/application/remote-access-server/build.gradle b/application/remote-access-server/build.gradle
index 045a8078a0..663b7748cc 100644
--- a/application/remote-access-server/build.gradle
+++ b/application/remote-access-server/build.gradle
@@ -15,6 +15,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index 5c17536de3..3bbdc3c94a 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -16,6 +16,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "APP_ID", "\"${rootProject.ext.appId}\""
buildConfigField 'String', 'VLC_OPEN_SUBTITLES_API_KEY', "\"${getOSApiKey(project)}\""
diff --git a/application/television/build.gradle b/application/television/build.gradle
index fa2a84e639..d6855018ba 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -21,6 +21,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/tools/build.gradle b/application/tools/build.gradle
index 25f11569d4..afca2232c9 100644
--- a/application/tools/build.gradle
+++ b/application/tools/build.gradle
@@ -9,6 +9,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 4d7575d24a..a4d416c2f8 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -43,6 +43,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
vectorDrawables.useSupportLibrary = true
}
diff --git a/build.gradle b/build.gradle
index 043167ffb6..d947497ea3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,8 +50,9 @@ ext {
libvlcVersion = vlcMajorVersion == 3 ? '3.6.2' :'4.0.0-eap20'
medialibraryVersion = vlcMajorVersion == 3 ? '0.13.13-rc17' : '0.13.13-vlc4-rc17'
minSdkVersion = vlcMajorVersion == 3 ? 17 : 21
+ buildToolsVersion = vlcMajorVersion == 3 ? '35.0.0' : '35.0.0'
targetSdkVersion = 34
- compileSdkVersion = 34
+ compileSdkVersion = 34 // Dockers: 3.0=36 / 4.0=36
desugarLib = '2.0.4'
androidxLegacyVersion = '1.0.0'
androidxCoreVersion = '1.12.0'
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index d3f58dfeb9..cda999abd1 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -38,6 +38,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdk rootProject.ext.compileSdkVersion
+ buildToolsVersion rootProject.ext.buildToolsVersion
}
sourceSets {
More information about the Android
mailing list