Browse Source

gradle: set the minSdk once globally

We keep the value in rootProject.ext as it's currenly used by libvlcjni.
merge-requests/2298/head
Steve Lhomme 1 year ago
committed by Nicolas Pomepuy
parent
commit
df70dd7070
  1. 5
      application/app/build.gradle
  2. 2
      application/donations/build.gradle
  3. 2
      application/live-plot-graph/build.gradle
  4. 2
      application/mediadb/build.gradle
  5. 2
      application/moviepedia/build.gradle
  6. 2
      application/remote-access-client/build.gradle
  7. 1
      application/remote-access-server/build.gradle
  8. 1
      application/resources/build.gradle
  9. 2
      application/television/build.gradle
  10. 2
      application/tools/build.gradle
  11. 1
      application/vlc-android/build.gradle
  12. 4
      medialibrary/build.gradle
  13. 3
      settings.gradle

5
application/app/build.gradle

@ -31,7 +31,6 @@ android {
defaultConfig { defaultConfig {
applicationId rootProject.ext.appId applicationId rootProject.ext.appId
minSdk rootProject.ext.minSdkVersion
versionCode rootProject.ext.versionCode versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName versionName rootProject.ext.versionName
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@ -70,9 +69,6 @@ android {
beforeVariants(selector().withBuildType("vlcBundle")) { variantBuilder -> beforeVariants(selector().withBuildType("vlcBundle")) { variantBuilder ->
variantBuilder.minSdk = 30 variantBuilder.minSdk = 30
} }
beforeVariants(selector().withBuildType("vlcBundleAmazon")) { variantBuilder ->
variantBuilder.minSdk = rootProject.ext.minSdkVersion
}
} }
buildTypes { buildTypes {
@ -80,7 +76,6 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions'] kotlinOptions.freeCompilerArgs = ['-Xno-param-assertions']
defaultConfig.minSdk rootProject.ext.minSdkVersion
} }
signedRelease { signedRelease {
initWith release initWith release

2
application/donations/build.gradle

@ -40,8 +40,6 @@ android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'
multiDexEnabled = true multiDexEnabled = true

2
application/live-plot-graph/build.gradle

@ -30,8 +30,6 @@ plugins {
android { android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'
} }

2
application/mediadb/build.gradle

@ -37,8 +37,6 @@ android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'
} }

2
application/moviepedia/build.gradle

@ -18,8 +18,6 @@ android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'

2
application/remote-access-client/build.gradle

@ -36,8 +36,6 @@ android {
namespace = 'org.videolan.vlc.remoteaccessclient' namespace = 'org.videolan.vlc.remoteaccessclient'
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
resValue "string", "build_remote_access_revision", remoteAccessRevision() resValue "string", "build_remote_access_revision", remoteAccessRevision()

1
application/remote-access-server/build.gradle

@ -12,7 +12,6 @@ android {
defaultConfig { defaultConfig {
multiDexEnabled = true multiDexEnabled = true
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

1
application/resources/build.gradle

@ -13,7 +13,6 @@ android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "APP_ID", "\"${rootProject.ext.appId}\"" buildConfigField "String", "APP_ID", "\"${rootProject.ext.appId}\""
buildConfigField 'String', 'VLC_OPEN_SUBTITLES_API_KEY', "\"${getOSApiKey(project)}\"" buildConfigField 'String', 'VLC_OPEN_SUBTITLES_API_KEY', "\"${getOSApiKey(project)}\""

2
application/television/build.gradle

@ -18,8 +18,6 @@ android {
dataBinding.enabled = true dataBinding.enabled = true
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro' consumerProguardFiles 'consumer-rules.pro'
} }

2
application/tools/build.gradle

@ -6,8 +6,6 @@ plugins {
android { android {
defaultConfig { defaultConfig {
minSdk rootProject.ext.minSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

1
application/vlc-android/build.gradle

@ -40,7 +40,6 @@ android {
// that the app's state is completely cleared between tests. // that the app's state is completely cleared between tests.
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
minSdk rootProject.ext.minSdkVersion
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
} }

4
medialibrary/build.gradle

@ -34,10 +34,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
defaultConfig {
minSdk rootProject.ext.minSdkVersion
}
sourceSets { sourceSets {
main { main {
jniLibs.srcDir 'jni/libs' // Where generated .so files are placed. jniLibs.srcDir 'jni/libs' // Where generated .so files are placed.

3
settings.gradle

@ -9,7 +9,10 @@ plugins {
id("com.android.settings") version "8.11.0" id("com.android.settings") version "8.11.0"
} }
def vlcMajorVersion = hasProperty('forceVlc4') && getProperty('forceVlc4') ? 4 : 3
android { android {
minSdk = vlcMajorVersion == 3 ? 17 : 21
targetSdk = 34 targetSdk = 34
compileSdk = 34 // Dockers: 3.0=36 / 4.0=36 compileSdk = 34 // Dockers: 3.0=36 / 4.0=36
buildToolsVersion = '35.0.0' buildToolsVersion = '35.0.0'

Loading…
Cancel
Save