diff --git a/gradle.properties b/gradle.properties index e82ce850bc..6779f02a8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled # AndroidX required by AGP >= 3.6.x android.useAndroidX=true -# AGP 9+ migration opt-out until build-logic moves to the new DSL and Variant API. -android.newDsl=false android.disableAgpUpgradePrompt=true diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts index 6fecebbfa3..a92fbb780e 100644 --- a/sentry-samples/sentry-samples-android/build.gradle.kts +++ b/sentry-samples/sentry-samples-android/build.gradle.kts @@ -1,6 +1,5 @@ import com.android.build.api.artifact.SingleArtifact import com.android.build.api.variant.BuildConfigField -import com.android.build.api.variant.impl.VariantImpl import io.sentry.android.gradle.extensions.InstrumentationFeature import io.sentry.android.gradle.extensions.SentryPluginExtension import org.apache.tools.ant.taskdefs.condition.Os @@ -159,14 +158,11 @@ android { mergedManifest.set(variant.artifacts.get(SingleArtifact.MERGED_MANIFEST)) repoDir.set(layout.projectDirectory.dir("../..").asFile.canonicalPath) } - project.afterEvaluate { - (variant as? VariantImpl<*>)?.taskContainer?.assembleTask?.configure { - finalizedBy(toggleNativeLoggingTask) - } - (variant as? VariantImpl<*>)?.taskContainer?.installTask?.configure { - finalizedBy(toggleNativeLoggingTask) - } - } + val finalizedTasks = + setOf("assemble${variant.name.capitalized()}", "install${variant.name.capitalized()}") + project.tasks + .matching { it.name in finalizedTasks } + .configureEach { finalizedBy(toggleNativeLoggingTask) } } @Suppress("UnstableApiUsage") packagingOptions { jniLibs { useLegacyPackaging = true } }