From df70dd70706468935f3235d458a6aec9166ffcfa Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 2 Jul 2025 11:08:38 +0200 Subject: [PATCH] gradle: set the minSdk once globally We keep the value in rootProject.ext as it's currenly used by libvlcjni. --- application/app/build.gradle | 5 ----- application/donations/build.gradle | 2 -- application/live-plot-graph/build.gradle | 2 -- application/mediadb/build.gradle | 2 -- application/moviepedia/build.gradle | 2 -- application/remote-access-client/build.gradle | 2 -- application/remote-access-server/build.gradle | 1 - application/resources/build.gradle | 1 - application/television/build.gradle | 2 -- application/tools/build.gradle | 2 -- application/vlc-android/build.gradle | 1 - medialibrary/build.gradle | 4 ---- settings.gradle | 3 +++ 13 files changed, 3 insertions(+), 26 deletions(-) diff --git a/application/app/build.gradle b/application/app/build.gradle index c83df6e26..b04e1326e 100644 --- a/application/app/build.gradle +++ b/application/app/build.gradle @@ -31,7 +31,6 @@ android { defaultConfig { applicationId rootProject.ext.appId - minSdk rootProject.ext.minSdkVersion versionCode rootProject.ext.versionCode versionName rootProject.ext.versionName vectorDrawables.useSupportLibrary = true @@ -70,9 +69,6 @@ android { beforeVariants(selector().withBuildType("vlcBundle")) { variantBuilder -> variantBuilder.minSdk = 30 } - beforeVariants(selector().withBuildType("vlcBundleAmazon")) { variantBuilder -> - variantBuilder.minSdk = rootProject.ext.minSdkVersion - } } buildTypes { @@ -80,7 +76,6 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions'] - defaultConfig.minSdk rootProject.ext.minSdkVersion } signedRelease { initWith release diff --git a/application/donations/build.gradle b/application/donations/build.gradle index 235f34d11..1f34b6f51 100644 --- a/application/donations/build.gradle +++ b/application/donations/build.gradle @@ -40,8 +40,6 @@ android { defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' multiDexEnabled = true diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle index 82b7ff60e..48b465150 100644 --- a/application/live-plot-graph/build.gradle +++ b/application/live-plot-graph/build.gradle @@ -30,8 +30,6 @@ plugins { android { defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle index e4bd6980e..2e8b6fc24 100644 --- a/application/mediadb/build.gradle +++ b/application/mediadb/build.gradle @@ -37,8 +37,6 @@ android { defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle index 1d0f74d21..d5fe61d2c 100644 --- a/application/moviepedia/build.gradle +++ b/application/moviepedia/build.gradle @@ -18,8 +18,6 @@ android { defaultConfig { - minSdk rootProject.ext.minSdkVersion - 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 05d4863fb..5fa0c30aa 100644 --- a/application/remote-access-client/build.gradle +++ b/application/remote-access-client/build.gradle @@ -36,8 +36,6 @@ android { namespace = 'org.videolan.vlc.remoteaccessclient' defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" resValue "string", "build_remote_access_revision", remoteAccessRevision() diff --git a/application/remote-access-server/build.gradle b/application/remote-access-server/build.gradle index f01d0d4dc..08f104ded 100644 --- a/application/remote-access-server/build.gradle +++ b/application/remote-access-server/build.gradle @@ -12,7 +12,6 @@ android { defaultConfig { multiDexEnabled = true - minSdk rootProject.ext.minSdkVersion testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/application/resources/build.gradle b/application/resources/build.gradle index 63ca1ec29..3926d075d 100644 --- a/application/resources/build.gradle +++ b/application/resources/build.gradle @@ -13,7 +13,6 @@ android { defaultConfig { - minSdk rootProject.ext.minSdkVersion 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 3c08bb14d..b825e5b23 100644 --- a/application/television/build.gradle +++ b/application/television/build.gradle @@ -18,8 +18,6 @@ android { dataBinding.enabled = true defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } diff --git a/application/tools/build.gradle b/application/tools/build.gradle index 25604b066..1d63894aa 100644 --- a/application/tools/build.gradle +++ b/application/tools/build.gradle @@ -6,8 +6,6 @@ plugins { android { defaultConfig { - minSdk rootProject.ext.minSdkVersion - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle index 7d7a69011..62956446f 100644 --- a/application/vlc-android/build.gradle +++ b/application/vlc-android/build.gradle @@ -40,7 +40,6 @@ android { // that the app's state is completely cleared between tests. testInstrumentationRunnerArguments clearPackageData: 'true' - minSdk rootProject.ext.minSdkVersion vectorDrawables.useSupportLibrary = true } diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle index 281465240..cc155e4c6 100644 --- a/medialibrary/build.gradle +++ b/medialibrary/build.gradle @@ -34,10 +34,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - defaultConfig { - minSdk rootProject.ext.minSdkVersion - } - sourceSets { main { jniLibs.srcDir 'jni/libs' // Where generated .so files are placed. diff --git a/settings.gradle b/settings.gradle index fecc06c80..2049113f2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,10 @@ plugins { id("com.android.settings") version "8.11.0" } +def vlcMajorVersion = hasProperty('forceVlc4') && getProperty('forceVlc4') ? 4 : 3 + android { + minSdk = vlcMajorVersion == 3 ? 17 : 21 targetSdk = 34 compileSdk = 34 // Dockers: 3.0=36 / 4.0=36 buildToolsVersion = '35.0.0'