[Android] Upgrade to Android plugin version 7.1.0
Nicolas Pomepuy
git at videolan.org
Fri Feb 4 10:40:50 UTC 2022
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Fri Feb 4 09:34:02 2022 +0100| [7f5aadd2f2e8cd21eedc4008afe8110df253fe4c] | committer: Nicolas Pomepuy
Upgrade to Android plugin version 7.1.0
> https://code.videolan.org/videolan/vlc-android/commit/7f5aadd2f2e8cd21eedc4008afe8110df253fe4c
---
application/app/build.gradle | 27 +++++++++++----------------
application/donations/build.gradle | 6 ++++--
application/mediadb/build.gradle | 6 ++++--
application/moviepedia/build.gradle | 6 ++++--
application/resources/build.gradle | 6 ++++--
application/television/build.gradle | 6 ++++--
application/vlc-android/build.gradle | 6 ++++--
build.gradle | 2 +-
buildsystem/compile.sh | 2 +-
buildsystem/gitlab/.gitlab-ci.yml | 2 +-
10 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index 9594d60c0..c3df4df12 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -10,20 +10,16 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
-
packagingOptions {
- exclude 'META-INF/main.kotlin_module'
- exclude 'META-INF/donations_debug.kotlin_module'
- exclude 'META-INF/mediadb_debug.kotlin_module'
- exclude 'META-INF/resources_debug.kotlin_module'
- exclude 'META-INF/television_debug.kotlin_module'
- pickFirst 'lib/armeabi-v7a/libc++_shared.so'
- pickFirst 'lib/armeabi/libc++_shared.so'
- pickFirst 'lib/arm64-v8a/libc++_shared.so'
- pickFirst 'lib/x86/libc++_shared.so'
- pickFirst 'lib/x86_64/libc++_shared.so'
+ jniLibs {
+ pickFirsts += ['lib/armeabi-v7a/libc++_shared.so', 'lib/armeabi/libc++_shared.so', 'lib/arm64-v8a/libc++_shared.so', 'lib/x86/libc++_shared.so', 'lib/x86_64/libc++_shared.so']
+ }
+ resources {
+ excludes += ['META-INF/main.kotlin_module', 'META-INF/donations_debug.kotlin_module', 'META-INF/mediadb_debug.kotlin_module', 'META-INF/resources_debug.kotlin_module', 'META-INF/television_debug.kotlin_module']
+ }
}
+
dexOptions {
maxProcessCount 8
javaMaxHeapSize "4g"
@@ -38,11 +34,6 @@ android {
flavorDimensions "abi"
- lintOptions {
- abortOnError false
- disable 'MissingTranslation', 'ExtraTranslation'
- }
-
defaultConfig {
applicationId rootProject.ext.appId
@@ -131,6 +122,10 @@ android {
}
def abiCodes = ['x86': 5, 'x86_64': 8, 'armeabi-v7a': 4, 'arm64-v8a': 7]
+ lint {
+ abortOnError false
+ disable 'MissingTranslation', 'ExtraTranslation'
+ }
// make per-variant version code
applicationVariants.all { variant ->
//Custom APK name and versionCode
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index 228dc0953..c0e7d151e 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -32,11 +32,13 @@ android {
dataBinding {
enabled = true
}
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 702e562fa..f382a92ce 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -29,11 +29,13 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
kotlinOptions.jvmTarget = "1.8"
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index 528b3b9c8..beedef06b 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -11,11 +11,13 @@ android {
dataBinding {
enabled = true
}
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index 798c0f2be..0ab395d62 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -6,11 +6,13 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
kotlinOptions.jvmTarget = "1.8"
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
diff --git a/application/television/build.gradle b/application/television/build.gradle
index c2d1452be..51b54ef77 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -4,11 +4,13 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion rootProject.ext.compileSdkVersion
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
androidExtensions {
features = ["parcelize"]
}
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index a2e43fe99..67106e1ad 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -12,11 +12,13 @@ android {
dataBinding {
enabled = true
}
-
packagingOptions {
- pickFirst '**/*.so'
+ jniLibs {
+ pickFirsts += ['**/*.so']
+ }
}
+
defaultConfig {
resValue "string", "build_time", buildTime()
diff --git a/build.gradle b/build.gradle
index 63c2b616a..b15eb20e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.android_plugin_version = '7.0.4'
+ ext.android_plugin_version = '7.1.0'
ext.kotlin_version = '1.4.31'
ext.kotlinx_version = '1.4.1'
repositories {
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 5151ab0e9..5240904d1 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -262,7 +262,7 @@ fi
if [ ! -d "gradle/wrapper" ]; then
diagnostic "Downloading gradle"
- GRADLE_VERSION=7.0.2
+ GRADLE_VERSION=7.2
GRADLE_URL=https://download.videolan.org/pub/contrib/gradle/gradle-${GRADLE_VERSION}-bin.zip
wget ${GRADLE_URL} 2>/dev/null || curl -O ${GRADLE_URL} || fail "gradle: download failed"
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index b49f9952b..2ee36e078 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -1,7 +1,7 @@
cache:
paths:
- .gradle/
- - gradle-7.0.2/
+ - gradle-7.2/
- gradle/
- gradlew
More information about the Android
mailing list