From 44db8041a5b0a982b8abc8ccc3c3a1476874eb54 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Thu, 30 Jan 2025 13:47:12 -0700
Subject: [PATCH] Use typed-rest-client/HttpClient in preference to
 @actions/HttpClient

---
 sources/package.json                        | 1 -
 sources/src/develocity/short-lived-token.ts | 2 +-
 sources/src/execution/provision.ts          | 2 +-
 sources/src/wrapper-validation/checksums.ts | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sources/package.json b/sources/package.json
index 4e430cd..a173808 100644
--- a/sources/package.json
+++ b/sources/package.json
@@ -38,7 +38,6 @@
     "@actions/exec": "1.1.1",
     "@actions/github": "6.0.0",
     "@actions/glob": "0.5.0",
-    "@actions/http-client": "2.2.3",
     "@actions/tool-cache": "2.0.2",
     "@octokit/rest": "21.1.0",
     "@octokit/webhooks-types": "7.6.1",
diff --git a/sources/src/develocity/short-lived-token.ts b/sources/src/develocity/short-lived-token.ts
index c059f96..d0cbbce 100644
--- a/sources/src/develocity/short-lived-token.ts
+++ b/sources/src/develocity/short-lived-token.ts
@@ -67,7 +67,7 @@ export async function getToken(accessKey: string, expiry: string): Promise<Devel
 }
 
 class ShortLivedTokenClient {
-    httpc = new httpm.HttpClient('gradle/actions/setup-gradle')
+    httpc = new httpm.HttpClient('gradle/actions')
     maxRetries = 3
     retryInterval = 1000
 
diff --git a/sources/src/execution/provision.ts b/sources/src/execution/provision.ts
index 40402a1..f3a9a56 100644
--- a/sources/src/execution/provision.ts
+++ b/sources/src/execution/provision.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
-import * as httpm from '@actions/http-client'
+import * as httpm from 'typed-rest-client/HttpClient'
 import * as core from '@actions/core'
 import * as cache from '@actions/cache'
 import * as toolCache from '@actions/tool-cache'
diff --git a/sources/src/wrapper-validation/checksums.ts b/sources/src/wrapper-validation/checksums.ts
index f6bcc14..0eff32a 100644
--- a/sources/src/wrapper-validation/checksums.ts
+++ b/sources/src/wrapper-validation/checksums.ts
@@ -4,7 +4,7 @@ import * as core from '@actions/core'
 
 import fileWrapperChecksums from './wrapper-checksums.json'
 
-const httpc = new httpm.HttpClient('gradle/wrapper-validation-action', undefined, {allowRetries: true, maxRetries: 3})
+const httpc = new httpm.HttpClient('gradle/actions', undefined, {allowRetries: true, maxRetries: 3})
 
 export class WrapperChecksums {
     checksums = new Map<string, Set<string>>()