Merge pull request #5707 from TacoTheDank/gradleDeprecations

Fix some gradle deprecations

15 files changed, 44 insertions, 18 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 520be2418..0257347fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,8 +43,8 @@ android {
 
     signingConfigs {
         releaseConfig {
-            v1SigningEnabled true
-            v2SigningEnabled true
+            enableV1Signing true
+            enableV2Signing true
 
             if (project.hasProperty("releaseStoreFile")) {
                 storeFile file(releaseStoreFile)
diff --git a/common.gradle b/common.gradle
index 4f023212b..8284d2325 100644
--- a/common.gradle
+++ b/common.gradle
@@ -1,9 +1,9 @@
 android {
-    compileSdkVersion 31
+    compileSdk 31
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdk 19
+        targetSdk 30
 
         multiDexEnabled false
         vectorDrawables.useSupportLibrary true
diff --git a/core/build.gradle b/core/build.gradle
index 700487701..af0e2a7a7 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../common.gradle"
 apply from: "../playFlavor.gradle"
 
diff --git a/event/build.gradle b/event/build.gradle
index c852c0351..033fc5a3c 100644
--- a/event/build.gradle
+++ b/event/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../common.gradle"
 
 dependencies {
diff --git a/model/build.gradle b/model/build.gradle
index 6f956a2d5..751a52ef6 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../common.gradle"
 
 dependencies {
diff --git a/net/ssl/build.gradle b/net/ssl/build.gradle
index 2a47968d3..f76823e2a 100644
--- a/net/ssl/build.gradle
+++ b/net/ssl/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
diff --git a/net/sync/gpoddernet/build.gradle b/net/sync/gpoddernet/build.gradle
index 13674b5c3..7a765e828 100644
--- a/net/sync/gpoddernet/build.gradle
+++ b/net/sync/gpoddernet/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../../common.gradle"
 
 dependencies {
diff --git a/net/sync/model/build.gradle b/net/sync/model/build.gradle
index 72d962536..205a00fb0 100644
--- a/net/sync/model/build.gradle
+++ b/net/sync/model/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../../common.gradle"
 
 dependencies {
diff --git a/parser/feed/build.gradle b/parser/feed/build.gradle
index 774e08a66..56b4ff740 100644
--- a/parser/feed/build.gradle
+++ b/parser/feed/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 android {
diff --git a/parser/media/build.gradle b/parser/media/build.gradle
index e463040b9..7dce7b86a 100644
--- a/parser/media/build.gradle
+++ b/parser/media/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 dependencies {
diff --git a/playback/base/build.gradle b/playback/base/build.gradle
index a1d344492..df49b2fb6 100644
--- a/playback/base/build.gradle
+++ b/playback/base/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 dependencies {
diff --git a/playback/cast/build.gradle b/playback/cast/build.gradle
index c51354838..64c16eb26 100644
--- a/playback/cast/build.gradle
+++ b/playback/cast/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
diff --git a/ui/app-start-intent/build.gradle b/ui/app-start-intent/build.gradle
index 2f6d821b1..1f5161392 100644
--- a/ui/app-start-intent/build.gradle
+++ b/ui/app-start-intent/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 dependencies {
diff --git a/ui/common/build.gradle b/ui/common/build.gradle
index 5390b85d8..bacb9f84c 100644
--- a/ui/common/build.gradle
+++ b/ui/common/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 dependencies {
diff --git a/ui/png-icons/build.gradle b/ui/png-icons/build.gradle
index f0d9f7a57..ad0b9d0b0 100644
--- a/ui/png-icons/build.gradle
+++ b/ui/png-icons/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
+}
 apply from: "../../common.gradle"
 
 android {