gradle: set the minSdk once globally

We keep the value in rootProject.ext as it's currenly used by libvlcjni.
1 year ago · df70dd7070
13 changed files with 3 additions and 26 deletions
--- 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
--- 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
--- 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'
    }
--- 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'
    }
--- 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'

--- 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()
--- 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"
--- 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)}\""
--- 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'
    }
--- 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"

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

--- 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.
--- 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'