From c7d309f44a64fa95da9ea453f69a242bf083468b Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 27 Jan 2022 13:19:39 +0530
Subject: [PATCH] Updated AGP and dependencies

---
 app/build.gradle                                 | 16 +++++++---------
 .../retromusic/cast/ExpandedControlsActivity.kt  |  4 ++--
 appthemehelper/build.gradle                      |  2 +-
 build.gradle                                     |  6 +++---
 gradle/wrapper/gradle-wrapper.properties         |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c70de5168..5b9117add 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,16 +45,14 @@ android {
     buildFeatures{
         viewBinding true
     }
-
     packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/java.properties'
+        resources {
+            excludes += ['META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/java.properties']
+        }
     }
-    lintOptions {
-        disable 'MissingTranslation'
-        disable 'InvalidPackage'
+    lint {
         abortOnError false
+        disable 'MissingTranslation', 'InvalidPackage'
     }
     compileOptions {
         coreLibraryDesugaringEnabled true
@@ -101,7 +99,7 @@ dependencies {
     implementation 'androidx.palette:palette-ktx:1.0.0'
 
     //Cast Dependencies
-    implementation 'androidx.mediarouter:mediarouter:1.2.5'
+    implementation 'androidx.mediarouter:mediarouter:1.2.6'
     implementation 'com.google.android.gms:play-services-cast-framework:21.0.1'
     //WebServer by NanoHttpd
     implementation "org.nanohttpd:nanohttpd:2.3.1"
@@ -115,7 +113,7 @@ dependencies {
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
 
-    def lifecycle_version = "2.4.0"
+    def lifecycle_version = "2.5.0-alpha01"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt
index a9c7b393a..2fbb2a4ff 100644
--- a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt
@@ -10,10 +10,10 @@ import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActi
 
 
 class ExpandedControlsActivity : ExpandedControllerActivity() {
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         super.onCreateOptionsMenu(menu)
         menuInflater.inflate(R.menu.menu_cast, menu)
-        CastButtonFactory.setUpMediaRouteButton(this, menu!!, R.id.action_cast)
+        CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.action_cast)
         return true
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index a2437f9b8..b703dfbc1 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -13,7 +13,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
     compileOptions {
diff --git a/build.gradle b/build.gradle
index 943652c2f..14c4d3c0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,9 @@
 buildscript {
     ext {
         kotlin_version = '1.6.10'
-        navigation_version = '2.4.0-rc01'
+        navigation_version = '2.5.0-alpha01'
         mdc_version = '1.5.0'
-        preference_version = '1.2.0-rc01'
+        preference_version = '1.2.0'
         appcompat_version = '1.4.1'
     }
 
@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7a5b14b8..888b130d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip