Try again to fix older Gradle versions

gradle · Feb 13, 2024 · 11375d1 · 11375d1
1 parent d962d2a
commit 11375d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractor.kt b/plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractor.kt
@@ -85,10 +85,6 @@ abstract class DependencyExtractor :
         handleBuildOperationType<
             EvaluateSettingsBuildOperationType.Details,
             EvaluateSettingsBuildOperationType.Result>(buildOperation, finishEvent) { details, _ -> extractSettings(details) }
-
-        if (buildOperation.metadata == BuildOperationCategory.RUN_WORK) {
-            handleBuildCompletion(finishEvent.failure)
-        }
     }
 
     private inline fun <reified D, reified R> handleBuildOperationType(

diff --git a/...n/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractorBuildService.kt b/...n/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractorBuildService.kt
@@ -3,6 +3,9 @@ package org.gradle.dependencygraph.extractor
 import org.gradle.api.provider.Property
 import org.gradle.api.services.BuildService
 import org.gradle.api.services.BuildServiceParameters
+import org.gradle.internal.operations.BuildOperationCategory
+import org.gradle.internal.operations.BuildOperationDescriptor
+import org.gradle.internal.operations.OperationFinishEvent
 
 abstract class DependencyExtractorBuildService :
     DependencyExtractor(),
@@ -16,4 +19,13 @@ abstract class DependencyExtractorBuildService :
     override fun getRendererClassName(): String {
         return parameters.rendererClassName.get()
     }
+
+    override fun finished(buildOperation: BuildOperationDescriptor, finishEvent: OperationFinishEvent) {
+        super.finished(buildOperation, finishEvent)
+
+        // Track build completion without 'buildFinished'
+        if (buildOperation.metadata == BuildOperationCategory.RUN_WORK) {
+            handleBuildCompletion(finishEvent.failure)
+        }
+    }
 }