Upgrade to Android plugin version 7.1.0

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

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

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

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

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
 

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

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()

build.gradle

 // 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 {

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"
 

buildsystem/gitlab/.gitlab-ci.yml

 cache:
     paths:
         - .gradle/
-        - gradle-7.0.2/
+        - gradle-7.2/
         - gradle/
         - gradlew