diff --git a/application/app/build.gradle b/application/app/build.gradle
index 636fbb8d6..9594d60c0 100644
--- a/application/app/build.gradle
+++ b/application/app/build.gradle
@@ -154,26 +154,26 @@ dependencies {
     implementation project(':application:television')
     testImplementation project(':application:television')
 
-    androidTestApi "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
-    androidTestApi "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
-    androidTestApi "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
-    testApi "junit:junit:$rootProject.ext.junitVersion"
-    androidTestApi "androidx.room:room-testing:$rootProject.ext.roomVersion"
-    testApi "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestApi "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestApi "androidx.test.ext:junit:$rootProject.ext.supportTest"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
+    testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest"
     androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator"
-    testApi "androidx.test:core:$rootProject.ext.testCore"
-    testApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"
-    testApi "org.mockito:mockito-core:$rootProject.ext.mockito"
-    testApi "io.mockk:mockk:$rootProject.ext.mockk"
-    testApi "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
-    testApi "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
-    testApi "com.jraska.livedata:testing-ktx:$rootProject.ext.livedataTest"
-    testApi "org.robolectric:robolectric:$rootProject.ext.robolectric"
-    androidTestApi "com.android.support:multidex:1.0.3"
+    testImplementation "androidx.test:core:$rootProject.ext.testCore"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"
+    testImplementation "org.mockito:mockito-core:$rootProject.ext.mockito"
+    testImplementation "io.mockk:mockk:$rootProject.ext.mockk"
+    testImplementation "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
+    testImplementation "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
+    testImplementation "com.jraska.livedata:testing-ktx:$rootProject.ext.livedataTest"
+    testImplementation "org.robolectric:robolectric:$rootProject.ext.robolectric"
+    androidTestImplementation "com.android.support:multidex:1.0.3"
     androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
-    androidTestApi 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'com.jraska:falcon:2.2.0'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
 }
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index b26fe7a08..228dc0953 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -40,8 +40,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index f51e5df82..6a961f50e 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -31,8 +31,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index 95a22105b..702e562fa 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -37,8 +37,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index f7f116eb7..d5d3e67fd 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -13,8 +13,6 @@ android {
 
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "APP_ID", "\"${rootProject.ext.appId}\""
@@ -66,8 +64,8 @@ dependencies {
     api "com.squareup.moshi:moshi-adapters:$rootProject.ext.moshi"
 
     api "androidx.core:core-ktx:$rootProject.ext.androidxCoreVersion"
-    testApi "androidx.test:core:$rootProject.ext.testCore"
-    androidTestApi "androidx.test.ext:junit:$rootProject.ext.supportTest"
+    testImplementation "androidx.test:core:$rootProject.ext.testCore"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest"
 }
 repositories {
     mavenCentral()
diff --git a/application/television/build.gradle b/application/television/build.gradle
index 750a16933..c2d1452be 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -22,8 +22,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -45,6 +43,6 @@ android {
 dependencies {
     implementation project(':application:vlc-android')
     api project(':application:moviepedia')
-    testApi "androidx.test:core:$rootProject.ext.testCore"
-    androidTestApi "androidx.test.ext:junit:$rootProject.ext.supportTest"
+    testImplementation "androidx.test:core:$rootProject.ext.testCore"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest"
 }
diff --git a/application/tools/build.gradle b/application/tools/build.gradle
index 3cb88fbea..019e65913 100644
--- a/application/tools/build.gradle
+++ b/application/tools/build.gradle
@@ -9,8 +9,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 12c147a4b..5993df699 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -36,8 +36,6 @@ android {
 
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
         vectorDrawables.useSupportLibrary = true
 
         javaCompileOptions {
@@ -194,24 +192,24 @@ dependencies {
     implementation 'nl.dionsegijn:konfetti:1.2.2'
 
     // Tests
-    androidTestApi "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
-    androidTestApi "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
-    androidTestApi "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
-    testApi "junit:junit:$rootProject.ext.junitVersion"
-    androidTestApi "androidx.room:room-testing:$rootProject.ext.roomVersion"
-    testApi "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestApi "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestApi "androidx.test.ext:junit:$rootProject.ext.supportTest"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
+    testImplementation "junit:junit:$rootProject.ext.junitVersion"
+    androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
+    testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest"
     androidTestUtil "androidx.test:orchestrator:$rootProject.ext.orchestrator"
-    testApi "androidx.test:core:$rootProject.ext.testCore"
-    testApi "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"
-    testApi "org.mockito:mockito-core:$rootProject.ext.mockito"
-    testApi "io.mockk:mockk:$rootProject.ext.mockk"
-    testApi "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
-    testApi "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
-    testApi "com.jraska.livedata:testing-ktx:$rootProject.ext.livedataTest"
-    testApi "org.robolectric:robolectric:$rootProject.ext.robolectric"
-    androidTestApi "androidx.test:rules:$rootProject.ext.testCore"
+    testImplementation "androidx.test:core:$rootProject.ext.testCore"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$rootProject.ext.kotlinx_version"
+    testImplementation "org.mockito:mockito-core:$rootProject.ext.mockito"
+    testImplementation "io.mockk:mockk:$rootProject.ext.mockk"
+    testImplementation "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
+    testImplementation "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
+    testImplementation "com.jraska.livedata:testing-ktx:$rootProject.ext.livedataTest"
+    testImplementation "org.robolectric:robolectric:$rootProject.ext.robolectric"
+    androidTestImplementation "androidx.test:rules:$rootProject.ext.testCore"
     androidTestImplementation 'com.jraska:falcon:2.2.0'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.0'
 
diff --git a/build.gradle b/build.gradle
index 25b0d978a..123d346f5 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 = '4.2.1'
+    ext.android_plugin_version = '7.0.2'
     ext.kotlin_version = '1.4.31'
     ext.kotlinx_version = '1.4.1'
     repositories {
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index ac8a9bc01..1f56eff58 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -263,7 +263,7 @@ fi
 
 if [ ! -d "gradle/wrapper" ]; then
     diagnostic "Downloading gradle"
-    GRADLE_VERSION=6.7.1
+    GRADLE_VERSION=7.0.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 547ad51ca..17f684e3b 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -6,6 +6,7 @@ cache:
         - gradle-6.5/
         - gradle-6.6/
         - gradle-6.7.1/
+        - gradle-7.0.2/
         - gradle/
         - gradlew
 
diff --git a/buildsystem/publish.gradle b/buildsystem/publish.gradle
index 356623b6b..a29e03511 100644
--- a/buildsystem/publish.gradle
+++ b/buildsystem/publish.gradle
@@ -1,4 +1,3 @@
-apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'org.videolan.android'
 version = library_version
diff --git a/extension-api/build.gradle b/extension-api/build.gradle
index 8735389ef..e866d86b6 100644
--- a/extension-api/build.gradle
+++ b/extension-api/build.gradle
@@ -22,7 +22,6 @@
  */
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 
 ext {
     library_version = '0.1'
@@ -38,8 +37,6 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         minSdkVersion rootProject.ext.minSdkVersion
     }
     buildTypes {
diff --git a/libvlc/build.gradle b/libvlc/build.gradle
index d94d0673a..bcd9146ee 100644
--- a/libvlc/build.gradle
+++ b/libvlc/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: "com.vanniktech.maven.publish"
 
 def abi = System.getenv('GRADLE_ABI')?.toLowerCase()
@@ -27,7 +26,6 @@ android {
 
     sourceSets {
         main {
-            jni.srcDirs = [] // Prevent gradle from building native code with ndk; we have our own Makefile for it.
             jniLibs.srcDirs = [ 'jni/libs' ]
             jniLibs.srcDirs += "$vlcSrcDirs"
             manifest.srcFile 'AndroidManifest.xml'
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index 984f1a655..94203a87b 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -21,7 +21,6 @@
  *  ***************************************************************************
  */
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: "com.vanniktech.maven.publish"
 
 def abi = System.getenv('GRADLE_ABI')?.toLowerCase()
@@ -41,8 +40,6 @@ android {
 
     sourceSets {
         main {
-            jni.srcDirs = []
-            // Prevent gradle from building native code with ndk; we have our own Makefile for it.
             jniLibs.srcDir 'jni/libs' // Where generated .so files are placed.
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']