Revert "Update to AGP 8.0.0-beta05"
Revert submission 2480835-agp-8.0.0-beta05
Reason for revert: broke compose inspection tests
Bug: 273151077
Reverted changes: /q/submissionid:2480835-agp-8.0.0-beta05
Change-Id: If3495b5c607de02ed6a5ff450d82dba1fd7a6709
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index d50b950..a62f433 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -845,7 +845,7 @@
void androidx.tv.foundation.lazy.list.LazyListKt.LazyList(androidx.compose.ui.Modifier, androidx.tv.foundation.lazy.list.TvLazyListState, androidx.compose.foundation.layout.PaddingValues, boolean, boolean, boolean, androidx.tv.foundation.PivotOffsets, androidx.compose.ui.Alignment$Horizontal, androidx.compose.foundation.layout.Arrangement$Vertical, androidx.compose.ui.Alignment$Vertical, androidx.compose.foundation.layout.Arrangement$Horizontal, kotlin.jvm.functions.Function1, androidx.compose.runtime.Composer, int, int, int)
void androidx.tv.foundation.lazy.grid.LazyGridKt.LazyGrid(androidx.compose.ui.Modifier, androidx.tv.foundation.lazy.grid.TvLazyGridState, kotlin.jvm.functions.Function2, androidx.compose.foundation.layout.PaddingValues, boolean, boolean, boolean, androidx.compose.foundation.layout.Arrangement$Vertical, androidx.compose.foundation.layout.Arrangement$Horizontal, androidx.tv.foundation.PivotOffsets, kotlin.jvm.functions.Function1, androidx.compose.runtime.Composer, int, int, int)
# > Task :room:integration-tests:room-testapp:mergeDexWithExpandProjectionDebugAndroidTest
-WARNING: D8: Application does not contain `androidx\.tracing\.Trace` as referenced in main\-dex\-list\.
+WARNING:D[0-9]+: Application does not contain `androidx\.tracing\.Trace` as referenced in main\-dex\-list\.
# > Task :hilt:hilt-compiler:kaptTestKotlin
Annotation processors discovery from compile classpath is deprecated\.
Set 'kapt\.include\.compile\.classpath=false' to disable discovery\.
diff --git a/development/update_studio.sh b/development/update_studio.sh
index 02c7a6a..2024fe4 100755
--- a/development/update_studio.sh
+++ b/development/update_studio.sh
@@ -7,8 +7,8 @@
# Get versions
echo Getting Studio version and link
-AGP_VERSION=${1:-8.0.0-beta05}
-STUDIO_VERSION_STRING=${2:-"Android Studio Flamingo | 2022.2.1 Beta 5"}
+AGP_VERSION=${1:-8.0.0-beta03}
+STUDIO_VERSION_STRING=${2:-"Android Studio Flamingo | 2022.2.1 Beta 3"}
STUDIO_IFRAME_LINK=`curl "https://developer.android.com/studio/archive.html" | grep "<iframe " | sed "s/.* src=\"\([^\"]*\)\".*/\1/g"`
echo iframe link $STUDIO_IFRAME_LINK
STUDIO_IFRAME_REDIRECT=`curl -s $STUDIO_IFRAME_LINK | grep href | sed 's/.*href="\([^"]*\)".*/\1/g'`
diff --git a/gradle.properties b/gradle.properties
index 35cce07..a26afbf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,7 +32,7 @@
androidx.allowCustomCompileSdk=false
# Don't warn about needing to update AGP
-android.suppressUnsupportedCompileSdk=Tiramisu,33,UpsideDownCake
+android.suppressUnsupportedCompileSdk=Tiramisu,33
# Disable features we do not use
android.defaults.buildfeatures.aidl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f77cc84..2383b5d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,13 +2,13 @@
# -----------------------------------------------------------------------------
# All of the following should be updated in sync.
# -----------------------------------------------------------------------------
-androidGradlePlugin = "8.0.0-beta05"
+androidGradlePlugin = "8.0.0-beta03"
# NOTE: When updating the lint version we also need to update the `api` version
# supported by `IssueRegistry`'s.' For e.g. r.android.com/1331903
-androidLint = "31.0.0-beta05"
+androidLint = "31.0.0-beta03"
# Once you have a chosen version of AGP to upgrade to, go to
# https://developer.android.com/studio/archive and find the matching version of Studio.
-androidStudio = "2022.2.1.16"
+androidStudio = "2022.2.1.14"
# -----------------------------------------------------------------------------
androidGradlePluginMin = "7.0.4"
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index cb426c3..36725cf 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -122,8 +122,6 @@
androidTestImplementation(project(":room:room-guava"))
androidTestImplementation(project(":room:room-paging"))
androidTestImplementation("androidx.arch.core:core-testing:2.0.1")
- androidTestImplementation(projectOrArtifact(":annotation:annotation-experimental"))
- androidTestImplementation(projectOrArtifact(":arch:core:core-runtime"))
androidTestImplementation(projectOrArtifact(":paging:paging-runtime"))
androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-runtime"))
androidTestImplementation(projectOrArtifact(":lifecycle:lifecycle-runtime-testing"))