From 666df50b8579b7e06489da871f51582595810ecc Mon Sep 17 00:00:00 2001
From: Eric Chang <erichang@google.com>
Date: Mon, 26 Jul 2021 17:48:21 -0700
Subject: [PATCH] Fix bug where on AGP 7.0+ the Gradle plugin bytecode
 transform was not applied to non-test code.

Also add AGP 7.0.0-beta04 to the AGP versions we test.

Fixes #2784.

RELNOTES=Fix bug where on AGP 7.0+ the Gradle plugin bytecode transform was not applied to non-test code (#2784)
PiperOrigin-RevId: 386999244
---
 .github/workflows/ci.yml                                        | 2 +-
 .../dagger/hilt/android/plugin/util/AndroidGradleCompat.kt      | 1 +
 util/run-local-tests.sh                                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bce159bddf..2da30f38dac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,7 +110,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        agp: ['4.1.0', '4.2.0']
+        agp: ['4.1.0', '4.2.0', '7.0.0-beta04']
     steps:
       - name: 'Check out repository'
         uses: actions/checkout@v2
diff --git a/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/AndroidGradleCompat.kt b/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/AndroidGradleCompat.kt
index 6cefbb34945..648862ec727 100644
--- a/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/AndroidGradleCompat.kt
+++ b/java/dagger/hilt/android/plugin/src/main/kotlin/dagger/hilt/android/plugin/util/AndroidGradleCompat.kt
@@ -45,6 +45,7 @@ sealed class AndroidComponentsExtensionCompat {
   ) : AndroidComponentsExtensionCompat() {
     override fun onAllVariants(block: (ComponentCompat) -> Unit) {
       actual.onVariants { variant ->
+        block.invoke(ComponentCompat.Api70Impl(variant))
         when (variant) {
           is ApplicationVariant -> variant.androidTest
           is LibraryVariant -> variant.androidTest
diff --git a/util/run-local-tests.sh b/util/run-local-tests.sh
index 77fe54d92da..0904fe1009b 100755
--- a/util/run-local-tests.sh
+++ b/util/run-local-tests.sh
@@ -18,4 +18,5 @@ pushd examples/maven && mvn compile && popd
 util/run-local-gradle-tests.sh
 util/run-local-gradle-android-tests.sh "4.1.0"
 util/run-local-gradle-android-tests.sh "4.2.0"
+util/run-local-gradle-android-tests.sh "7.0.0-beta04"