From 2041ce6ab1dd249b22bc60dc57c395123f6eb11a Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Fri, 19 Jul 2024 15:03:13 -0600
Subject: [PATCH] Fail on delegation from legacy actions

---
 sources/src/actions/setup-gradle/main.ts       | 9 ++++-----
 sources/src/actions/wrapper-validation/main.ts | 8 ++++----
 sources/src/deprecation-collector.ts           | 6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/sources/src/actions/setup-gradle/main.ts b/sources/src/actions/setup-gradle/main.ts
index 18f67b8..75289a7 100644
--- a/sources/src/actions/setup-gradle/main.ts
+++ b/sources/src/actions/setup-gradle/main.ts
@@ -10,7 +10,7 @@ import {
     getActionId,
     setActionId
 } from '../../configuration'
-import {recordDeprecation, saveDeprecationState} from '../../deprecation-collector'
+import {failOnUseOfRemovedFeature, saveDeprecationState} from '../../deprecation-collector'
 import {handleMainActionError} from '../../errors'
 
 /**
@@ -19,14 +19,13 @@ import {handleMainActionError} from '../../errors'
 export async function run(): Promise<void> {
     try {
         if (getActionId() === 'gradle/gradle-build-action') {
-            
-            recordDeprecation(
+            failOnUseOfRemovedFeature(
                 'The action `gradle/gradle-build-action` has been replaced by `gradle/actions/setup-gradle`'
             )
-        } else {
-            setActionId('gradle/actions/setup-gradle')
         }
 
+        setActionId('gradle/actions/setup-gradle')
+
         // Check for invalid wrapper JARs if requested
         if (doValidateWrappers()) {
             await setupGradle.checkNoInvalidWrapperJars()
diff --git a/sources/src/actions/wrapper-validation/main.ts b/sources/src/actions/wrapper-validation/main.ts
index ca1453e..fad3e5d 100644
--- a/sources/src/actions/wrapper-validation/main.ts
+++ b/sources/src/actions/wrapper-validation/main.ts
@@ -3,19 +3,19 @@ import * as core from '@actions/core'
 
 import * as validate from '../../wrapper-validation/validate'
 import {getActionId, setActionId} from '../../configuration'
-import {recordDeprecation, emitDeprecationWarnings} from '../../deprecation-collector'
+import {failOnUseOfRemovedFeature, emitDeprecationWarnings} from '../../deprecation-collector'
 import {handleMainActionError} from '../../errors'
 
 export async function run(): Promise<void> {
     try {
         if (getActionId() === 'gradle/wrapper-validation-action') {
-            recordDeprecation(
+            failOnUseOfRemovedFeature(
                 'The action `gradle/wrapper-validation-action` has been replaced by `gradle/actions/wrapper-validation`'
             )
-        } else {
-            setActionId('gradle/actions/wrapper-validation')
         }
 
+        setActionId('gradle/actions/wrapper-validation')
+
         const result = await validate.findInvalidWrapperJars(
             path.resolve('.'),
             +core.getInput('min-wrapper-count'),
diff --git a/sources/src/deprecation-collector.ts b/sources/src/deprecation-collector.ts
index a3ee8b1..26d6870 100644
--- a/sources/src/deprecation-collector.ts
+++ b/sources/src/deprecation-collector.ts
@@ -22,11 +22,9 @@ export function recordDeprecation(message: string): void {
     }
 }
 
-export function failOnUseOfRemovedFeature(removalMessage: string, deprecationMessage: string): void {
+export function failOnUseOfRemovedFeature(removalMessage: string, deprecationMessage: string = removalMessage): void {
     const deprecation = new Deprecation(deprecationMessage)
-    core.error(
-        `${removalMessage}. See ${deprecation.getDocumentationLink()}`
-    )
+    core.error(`${removalMessage}. See ${deprecation.getDocumentationLink()}`)
 }
 
 export function getDeprecations(): Deprecation[] {