From df8b8e2c2e5709e4b37d3ae57ecc4b81679d92f9 Mon Sep 17 00:00:00 2001 From: Dagger Team Date: Wed, 13 Jul 2022 10:43:46 -0700 Subject: [PATCH] Use ASM9 when AGP 7.1.0+ is used RELNOTES=Use ASM9 when AGP 7.1.0+ is used PiperOrigin-RevId: 460752989 --- .../kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/dagger/hilt/android/plugin/main/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt b/java/dagger/hilt/android/plugin/main/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt index 786dd71ac88..06d0825a724 100644 --- a/java/dagger/hilt/android/plugin/main/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt +++ b/java/dagger/hilt/android/plugin/main/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt @@ -44,6 +44,7 @@ import org.gradle.api.attributes.Attribute import org.gradle.api.provider.ProviderFactory import org.gradle.api.tasks.compile.JavaCompile import org.gradle.process.CommandLineArgumentProvider +import org.objectweb.asm.Opcodes /** * A Gradle plugin that checks if the project is an Android project and if so, registers a @@ -348,6 +349,9 @@ class HiltGradlePlugin @Inject constructor( it.crossCompilationRootValidationDisabled.set( hiltExtension.disableCrossCompilationRootValidation ) + if (SimpleAGPVersion.ANDROID_GRADLE_PLUGIN_VERSION >= SimpleAGPVersion(7, 1)) { + it.asmApiVersion.set(Opcodes.ASM9) + } } val componentClasses = project.files(