From 98ac3b0d2902f795e16f596c89cd5281ef64698b Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 2 Jul 2025 09:30:37 +0200 Subject: [PATCH] gradle: set the buildToolsVersion globally We don't need to separate between VLC 3 and VLC 4 as they use the same code except for VlcMigrationHelper. --- 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 - medialibrary/build.gradle | 1 - settings.gradle | 1 + 13 files changed, 1 insertion(+), 12 deletions(-) diff --git a/application/app/build.gradle b/application/app/build.gradle index b66907124..c83df6e26 100644 --- a/application/app/build.gradle +++ b/application/app/build.gradle @@ -32,7 +32,6 @@ android { defaultConfig { applicationId rootProject.ext.appId minSdk rootProject.ext.minSdkVersion - 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 0c818a0b6..235f34d11 100644 --- a/application/donations/build.gradle +++ b/application/donations/build.gradle @@ -41,7 +41,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 e159e9841..82b7ff60e 100644 --- a/application/live-plot-graph/build.gradle +++ b/application/live-plot-graph/build.gradle @@ -31,7 +31,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 db48dd0ed..e4bd6980e 100644 --- a/application/mediadb/build.gradle +++ b/application/mediadb/build.gradle @@ -38,7 +38,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 d65ad2dd1..1d0f74d21 100644 --- a/application/moviepedia/build.gradle +++ b/application/moviepedia/build.gradle @@ -19,7 +19,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 797ff8a25..05d4863fb 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -37,7 +37,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 e9980f005..f01d0d4dc 100644 --- a/application/remote-access-server/build.gradle +++ b/application/remote-access-server/build.gradle @@ -13,7 +13,6 @@ android { defaultConfig { multiDexEnabled = true minSdk rootProject.ext.minSdkVersion - 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 2c3691578..63ca1ec29 100644 --- a/application/resources/build.gradle +++ b/application/resources/build.gradle @@ -14,7 +14,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 0ce3d9cdb..3c08bb14d 100644 --- a/application/television/build.gradle +++ b/application/television/build.gradle @@ -19,7 +19,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - 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 8127795e4..25604b066 100644 --- a/application/tools/build.gradle +++ b/application/tools/build.gradle @@ -7,7 +7,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle index dd45f0315..7d7a69011 100644 --- a/application/vlc-android/build.gradle +++ b/application/vlc-android/build.gradle @@ -41,7 +41,6 @@ android { testInstrumentationRunnerArguments clearPackageData: 'true' minSdk rootProject.ext.minSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion vectorDrawables.useSupportLibrary = true } diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle index 4565c962b..281465240 100644 --- a/medialibrary/build.gradle +++ b/medialibrary/build.gradle @@ -36,7 +36,6 @@ android { defaultConfig { minSdk rootProject.ext.minSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion } sourceSets { diff --git a/settings.gradle b/settings.gradle index a71ee57b7..fecc06c80 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,6 +12,7 @@ plugins { android { targetSdk = 34 compileSdk = 34 // Dockers: 3.0=36 / 4.0=36 + buildToolsVersion = '35.0.0' } include ':libvlcjni:libvlc', ':medialibrary'