Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 5 additions & 9 deletions sentry-samples/sentry-samples-android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 } }
Expand Down
Loading