From 485517f34d6b6e865256ef4af7f61bd3db1ecabf Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 19 May 2023 16:58:00 +0100
Subject: [PATCH] Upgrade to Gradle 8.0 and Android Gradle Plugin 8.0.1

This change was auto-generated by the Android Studio Upgrade Assistant.

Issue: androidx/media#409
PiperOrigin-RevId: 533467455
---
 build.gradle                               | 2 +-
 gradle.properties                          | 3 +++
 gradle/wrapper/gradle-wrapper.properties   | 2 +-
 libraries/session/build.gradle             | 3 +++
 libraries/test_session_common/build.gradle | 4 ++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b6a5a5846f..a5520e6388 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.4'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20'
     }
diff --git a/gradle.properties b/gradle.properties
index 226168bb1d..f3f6357194 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,3 +5,6 @@ android.enableJetifier=true
 android.jetifier.ignorelist=bcprov
 buildDir=buildout
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92f06b50fd..3a02907943 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libraries/session/build.gradle b/libraries/session/build.gradle
index 254f6d1eb8..e989c3d022 100644
--- a/libraries/session/build.gradle
+++ b/libraries/session/build.gradle
@@ -33,6 +33,9 @@ android {
             withSourcesJar()
         }
     }
+    buildFeatures {
+        aidl true
+    }
 }
 dependencies {
     api project(modulePrefix + 'lib-common')
diff --git a/libraries/test_session_common/build.gradle b/libraries/test_session_common/build.gradle
index 0b35e0b1aa..9ca25bd7b6 100644
--- a/libraries/test_session_common/build.gradle
+++ b/libraries/test_session_common/build.gradle
@@ -15,6 +15,10 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
 
 android {
     namespace 'androidx.media3.test.session.common'
+
+    buildFeatures {
+        aidl true
+    }
 }
 
 dependencies {