From 11375d127f1a42d9b34c959c8a8ee95d38ca243e Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Mon, 12 Feb 2024 19:54:36 -0700
Subject: [PATCH] Try again to fix older Gradle versions

---
 .../dependencygraph/extractor/DependencyExtractor.kt |  4 ----
 .../extractor/DependencyExtractorBuildService.kt     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 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
index 3e71c576..da017b38 100644
--- 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/plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractorBuildService.kt b/plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractorBuildService.kt
index d0448c17..a7e75fa9 100644
--- a/plugin/src/main/kotlin/org/gradle/dependencygraph/extractor/DependencyExtractorBuildService.kt
+++ b/plugin/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)
+        }
+    }
 }
\ No newline at end of file