Remove ExternalDependenciesReportTask redundant factory (#918)

Author: runningcode

plugin-build/src/main/kotlin/io/sentry/android/gradle/AGP74Compat.kt

@@ -83,15 +83,6 @@ data class AndroidVariant74(private val variant: Variant) : SentryVariant {
   }
 }
 
-fun <T : Task> configureGeneratedSourcesFor74(
-  variant: Variant,
-  vararg tasks: Pair<TaskProvider<out T>, (T) -> DirectoryProperty>,
-) {
-  tasks.forEach { (task, output) ->
-    variant.sources.assets?.addGeneratedSourceDirectory(task, output)
-  }
-}
-
 fun <T : InstrumentationParameters> configureInstrumentationFor74(
   variant: Variant,
   classVisitorFactoryImplClass: Class<out AsmClassVisitorFactory<T>>,

plugin-build/src/main/kotlin/io/sentry/android/gradle/AndroidComponentsConfig.kt

@@ -20,14 +20,13 @@ import io.sentry.android.gradle.instrumentation.SpanAddingClassVisitorFactory
 import io.sentry.android.gradle.services.SentryModulesService
 import io.sentry.android.gradle.sourcecontext.OutputPaths
 import io.sentry.android.gradle.sourcecontext.SourceContext
-import io.sentry.android.gradle.tasks.DirectoryOutputTask
 import io.sentry.android.gradle.tasks.InjectSentryMetaPropertiesIntoAssetsTask
 import io.sentry.android.gradle.tasks.PropertiesFileOutputTask
 import io.sentry.android.gradle.tasks.SentryGenerateIntegrationListTask
 import io.sentry.android.gradle.tasks.SentryGenerateProguardUuidTask
 import io.sentry.android.gradle.tasks.SentryUploadProguardMappingsTask
 import io.sentry.android.gradle.tasks.configureNativeSymbolsTask
-import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskFactory
+import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskV2
 import io.sentry.android.gradle.telemetry.SentryTelemetryService
 import io.sentry.android.gradle.util.GroovyCompat
 import io.sentry.android.gradle.util.ReleaseInfo
@@ -289,7 +288,7 @@ private fun Variant.configureDependenciesTask(
 ) {
   if (extension.includeDependenciesReport.get()) {
     val reportDependenciesTask =
-      SentryExternalDependenciesReportTaskFactory.register(
+      SentryExternalDependenciesReportTaskV2.register(
         project = project,
         extension,
         sentryTelemetryProvider,
@@ -298,10 +297,7 @@ private fun Variant.configureDependenciesTask(
         includeReport = extension.includeDependenciesReport,
         taskSuffix = name.capitalized,
       )
-    configureGeneratedSourcesFor74(
-      variant = this,
-      reportDependenciesTask to DirectoryOutputTask::output,
-    )
+    sources.assets?.addGeneratedSourceDirectory(reportDependenciesTask) { task -> task.output }
   }
 }
 

plugin-build/src/main/kotlin/io/sentry/android/gradle/sourcecontext/CollectSourcesTask.kt

@@ -12,7 +12,6 @@ import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.CacheableTask
@@ -112,13 +111,3 @@ internal fun DirectoryProperty.getAndDelete(): File {
   }
   return file
 }
-
-internal fun RegularFileProperty.getAndDelete(): File {
-  val file = get().asFile
-  if (file.isDirectory) {
-    file.deleteRecursively()
-  } else {
-    file.delete()
-  }
-  return file
-}

plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/dependencies/SentryExternalDependenciesReportTaskFactory.kt

@@ -2,7 +2,6 @@ package io.sentry.android.gradle.tasks.dependencies
 
 import io.sentry.android.gradle.extensions.SentryPluginExtension
 import io.sentry.android.gradle.tasks.DirectoryOutputTask
-import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskFactory.SENTRY_DEPENDENCIES_REPORT_OUTPUT
 import io.sentry.android.gradle.telemetry.SentryTelemetryService
 import io.sentry.android.gradle.telemetry.withSentryTelemetry
 import io.sentry.android.gradle.util.artifactsFor
@@ -34,7 +33,6 @@ abstract class SentryExternalDependenciesReportTaskV2 : DirectoryOutputTask() {
   @TaskAction
   fun action() {
     val outputDir = output.get().asFile
-    outputDir.mkdirs()
 
     val dependencies = artifactIds.get().toSortedSet()
 
@@ -43,13 +41,16 @@ abstract class SentryExternalDependenciesReportTaskV2 : DirectoryOutputTask() {
   }
 
   companion object {
+
+    internal const val SENTRY_DEPENDENCIES_REPORT_OUTPUT = "sentry-external-modules.txt"
+
     fun register(
       project: Project,
       extension: SentryPluginExtension,
       sentryTelemetryProvider: Provider<SentryTelemetryService>,
       configurationName: String,
       attributeValueJar: String,
-      output: Provider<Directory>?,
+      output: Provider<Directory>? = null,
       includeReport: Provider<Boolean>,
       taskSuffix: String = "",
     ): TaskProvider<SentryExternalDependenciesReportTaskV2> {

plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/dependencies/SentryExternalDependenciesReportTaskV2.kt

@@ -8,7 +8,7 @@ import io.sentry.android.gradle.extensions.SentryPluginExtension
 import io.sentry.android.gradle.sourcecontext.OutputPaths
 import io.sentry.android.gradle.sourcecontext.SourceContext
 import io.sentry.android.gradle.tasks.SentryGenerateDebugMetaPropertiesTask
-import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskFactory
+import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskV2
 import io.sentry.android.gradle.telemetry.SentryTelemetryService
 import io.sentry.android.gradle.util.SentryPluginUtils
 import io.sentry.android.gradle.util.hookWithAssembleTasks
@@ -114,7 +114,7 @@ constructor(private val buildEvents: BuildEventListenerRegistryInternal) : Plugi
         )
 
       val reportDependenciesTask =
-        SentryExternalDependenciesReportTaskFactory.register(
+        SentryExternalDependenciesReportTaskV2.register(
           project = project,
           extension,
           sentryTelemetryProvider,

plugin-build/src/main/kotlin/io/sentry/jvm/gradle/SentryJvmPlugin.kt

@@ -1,6 +1,6 @@
 package io.sentry.android.gradle.tasks.dependencies
 
-import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskFactory.SENTRY_DEPENDENCIES_REPORT_OUTPUT
+import io.sentry.android.gradle.tasks.dependencies.SentryExternalDependenciesReportTaskV2.Companion.SENTRY_DEPENDENCIES_REPORT_OUTPUT
 import java.io.File
 import kotlin.test.assertEquals
 import org.gradle.api.Project