From 5a3f2ce13a0328a0a776af85fdc4287886084b6a Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Fri, 2 Jan 2026 15:33:00 -0500
Subject: [PATCH] [gradle] More gradle 9 codesign updates (#8536)

This replicates the fix in #8531 for other binaries that are still tripping up CI.
---
 glass/publish.gradle               | 8 ++++----
 tools/datalogtool/publish.gradle   | 8 ++++----
 tools/outlineviewer/publish.gradle | 8 ++++----
 tools/sysid/publish.gradle         | 8 ++++----
 tools/wpical/publish.gradle        | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/glass/publish.gradle b/glass/publish.gradle
index 383ad31954..46349e815a 100644
--- a/glass/publish.gradle
+++ b/glass/publish.gradle
@@ -129,8 +129,8 @@ model {
                                 doLast {
                                     if (project.hasProperty("developerID")) {
                                         // Get path to binary.
-                                        exec {
-                                            workingDir rootDir
+                                        providers.exec {
+                                            setWorkingDir(rootDir)
                                             def args = [
                                                 "sh",
                                                 "-c",
@@ -139,8 +139,8 @@ model {
                                                 "--verbose -s ${project.findProperty("developerID")} " +
                                                 "$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/Glass.app/"
                                             ]
-                                            commandLine args
-                                        }
+                                            commandLine(args)
+                                        }.result.get()
                                     }
                                 }
                             }
diff --git a/tools/datalogtool/publish.gradle b/tools/datalogtool/publish.gradle
index 40d8fdb198..bf073395a7 100644
--- a/tools/datalogtool/publish.gradle
+++ b/tools/datalogtool/publish.gradle
@@ -74,8 +74,8 @@ model {
                                 doLast {
                                     if (project.hasProperty("developerID")) {
                                         // Get path to binary.
-                                        exec {
-                                            workingDir rootDir
+                                        providers.exec {
+                                            setWorkingDir(rootDir)
                                             def args = [
                                                 "sh",
                                                 "-c",
@@ -84,8 +84,8 @@ model {
                                                 "--verbose -s ${project.findProperty("developerID")} " +
                                                 "$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/DataLogTool.app/"
                                             ]
-                                            commandLine args
-                                        }
+                                            commandLine(args)
+                                        }.result.get()
                                     }
                                 }
                             }
diff --git a/tools/outlineviewer/publish.gradle b/tools/outlineviewer/publish.gradle
index 4e29617b00..0fe289d4b8 100644
--- a/tools/outlineviewer/publish.gradle
+++ b/tools/outlineviewer/publish.gradle
@@ -74,8 +74,8 @@ model {
                                 doLast {
                                     if (project.hasProperty("developerID")) {
                                         // Get path to binary.
-                                        exec {
-                                            workingDir rootDir
+                                        providers.exec {
+                                            setWorkingDir(rootDir)
                                             def args = [
                                                 "sh",
                                                 "-c",
@@ -84,8 +84,8 @@ model {
                                                 "--verbose -s ${project.findProperty("developerID")} " +
                                                 "$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/OutlineViewer.app/"
                                             ]
-                                            commandLine args
-                                        }
+                                            commandLine(args)
+                                        }.result.get()
                                     }
                                 }
                             }
diff --git a/tools/sysid/publish.gradle b/tools/sysid/publish.gradle
index ea0ed704d9..c619ff2aa6 100644
--- a/tools/sysid/publish.gradle
+++ b/tools/sysid/publish.gradle
@@ -50,8 +50,8 @@ model {
                             doLast {
                                 if (project.hasProperty("developerID")) {
                                     // Get path to binary.
-                                    exec {
-                                        workingDir rootDir
+                                    providers.exec {
+                                        setWorkingDir(rootDir)
                                         def args = [
                                             "sh",
                                             "-c",
@@ -60,8 +60,8 @@ model {
                                             "--verbose -s ${project.findProperty("developerID")} " +
                                             "$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/SysId.app/"
                                         ]
-                                        commandLine args
-                                    }
+                                        commandLine(args)
+                                    }.result.get()
                                 }
                             }
                         }
diff --git a/tools/wpical/publish.gradle b/tools/wpical/publish.gradle
index e324f3f4a3..ee88bf2345 100644
--- a/tools/wpical/publish.gradle
+++ b/tools/wpical/publish.gradle
@@ -78,8 +78,8 @@ model {
                                 doLast {
                                     if (project.hasProperty("developerID")) {
                                         // Get path to binary.
-                                        exec {
-                                            workingDir rootDir
+                                        providers.exec {
+                                            setWorkingDir(rootDir)
                                             def args = [
                                                 "sh",
                                                 "-c",
@@ -88,8 +88,8 @@ model {
                                                 "--verbose -s ${project.findProperty("developerID")} " +
                                                 "$project.buildDir/outputs/bundles/$binary.targetPlatform.architecture.name/wpical.app/"
                                             ]
-                                            commandLine args
-                                        }
+                                            commandLine(args)
+                                        }.result.get()
                                     }
                                 }
                             }