chore: define ext.injected in common-utilities

omegat-org · Jan 20, 2025 · 5cce112 · 5cce112
1 parent 1730507
commit 5cce112
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/build-logic/src/main/groovy/org.omegat.common-utilities.gradle b/build-logic/src/main/groovy/org.omegat.common-utilities.gradle
@@ -5,6 +5,8 @@ interface InjectedExecOps {
     ExecOperations getExecOps()
 }
 
+ext.injected = project.objects.newInstance(InjectedExecOps)
+
 ext.loadProperties = { propFile ->
     def config = new Properties()
     if (propFile.canRead()) {

diff --git a/build-logic/src/main/groovy/org.omegat.mac-conventions.gradle b/build-logic/src/main/groovy/org.omegat.mac-conventions.gradle
@@ -63,7 +63,6 @@ ext.makeHunspellSignTask = {
         destinationDir = file(layout.buildDirectory.file("hunspell"))
         doLast {
             def dylibs = fileTree(dir: destinationDir, include: '**/*.dylib').files
-            def injected = project.objects.newInstance(InjectedExecOps)
             injected.execOps.exec {
                 commandLine('codesign', '--deep', '--force',
                         '--sign', project.property('macCodesignIdentity'),
@@ -208,7 +207,6 @@ ext.makeMacTask = { args ->
             delete "$destinationDir/OmegaT.app/Contents/PlugIns/jre.bundle"
         }
         doLast {
-            def injected = project.objects.newInstance(InjectedExecOps)
             injected.execOps.exec {
                 commandLine 'codesign', '--deep', '--force',
                         '--sign', project.property('macCodesignIdentity'),
@@ -238,7 +236,6 @@ ext.makeMacTask = { args ->
         }
         inputs.files signedZipTask.get().archiveFile
         doLast {
-            def injected = project.objects.newInstance(InjectedExecOps)
             injected.execOps.exec {
                 // Assuming setup per instructions at
                 // https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution/customizing_the_notarization_workflow#3087734
@@ -260,7 +257,6 @@ ext.makeMacTask = { args ->
             condition(exePresent('xcrun'), 'XCode is not present in system.')
         }
         doFirst {
-            def injected = project.objects.newInstance(InjectedExecOps)
             if (args.name.equals("mac")) {
                 injected.execOps.exec {
                     commandLine 'xcrun', 'stapler', 'staple', "${macInstallSignedDist.destinationDir}/OmegaT.app"

diff --git a/build-logic/src/main/groovy/org.omegat.verification-conventions.gradle b/build-logic/src/main/groovy/org.omegat.verification-conventions.gradle
@@ -173,7 +173,6 @@ tasks.register('testAcceptance', Test) {
         def lockFile = new File("/tmp/.X${display}-lock")
         if (!lockFile.exists()) {
             def outputStream = new ByteArrayOutputStream()
-            def injected = project.objects.newInstance(InjectedExecOps)
             def res = injected.execOps.exec {
                 commandLine 'sh', '-c', "Xvfb :${display} -screen 0 1280x1024x24 >>/dev/null 2>&1 & echo \$!"
                 standardOutput = outputStream