Revert "Revert "Add temporary workaround for code signing issues with…

… libjffi on Apple Silicon machines.""

This reverts commit 7eabe8d.

See jnr/jffi#116 (comment)

.github/workflows/ci.yml

@@ -305,9 +305,6 @@ jobs:
         with:
           flags: linux
 
-      - name: Assemble release
-        run: unset JAVA_TOOL_OPTIONS && ./gradlew --parallel assembleRelease
-
       - name: Stop Gradle daemon
         run: ./gradlew --stop
 
@@ -329,13 +326,6 @@ jobs:
           rm -f  $HOME/.gradle/caches/journal-1/file-access.bin
           rm -f  $HOME/.gradle/caches/journal-1/*.lock
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2.2.4
-        with:
-          name: Binaries
-          path: build/release
-          if-no-files-found: error
-
   wrapper-test-linux:
     name: "Run wrapper tests (Linux)"
     runs-on: ubuntu-18.04
@@ -569,6 +559,9 @@ jobs:
         with:
           flags: mac
 
+      - name: Assemble release
+        run: unset JAVA_TOOL_OPTIONS && ./gradlew --parallel assembleRelease
+
       - name: Stop Gradle daemon
         run: ./gradlew --stop
 
@@ -590,6 +583,13 @@ jobs:
           rm -f  $HOME/.gradle/caches/journal-1/file-access.bin
           rm -f  $HOME/.gradle/caches/journal-1/*.lock
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2.2.4
+        with:
+          name: Binaries
+          path: build/release
+          if-no-files-found: error
+
   publish-release:
     name: "Publish release"
     needs:

app/gradle/shadow.gradle

@@ -14,6 +14,11 @@
     limitations under the License.
 */
 
+import java.nio.file.Files
+import java.nio.file.Path
+
+def buildIsRunningOnMacOS = org.gradle.internal.os.OperatingSystem.current().isMacOsX()
+
 // See https://github.com/johnrengelman/shadow/issues/389#issuecomment-440431318 for an explanation of this.
 tasks.withType(AbstractArchiveTask).configureEach {
     preserveFileTimestamps = false
@@ -26,4 +31,32 @@ tasks.withType(Jar).configureEach {
 
 shadowJar {
     classifier = null
+
+    doLast {
+        if (buildIsRunningOnMacOS) {
+            Path workingDirectory = project.buildDir.toPath().resolve("codesigning")
+            Files.createDirectories(workingDirectory)
+
+            String jarPath = it.archiveFile.get()
+            runProcessInDirectory(workingDirectory, "jar", "xf", jarPath, "jni/Darwin/libjffi-1.2.jnilib")
+            runProcessInDirectory(workingDirectory, "codesign", "-s", "-", "jni/Darwin/libjffi-1.2.jnilib")
+            runProcessInDirectory(workingDirectory, "jar", "uf", jarPath, "jni/Darwin/libjffi-1.2.jnilib")
+        }
+    }
+}
+
+static String runProcessInDirectory(Path workingDirectory, String... args) {
+    def process = new ProcessBuilder(args)
+        .directory(workingDirectory.toFile())
+        .redirectErrorStream(true)
+        .start()
+
+    def exitCode = process.waitFor()
+    def output = process.inputStream.getText()
+
+    if (exitCode != 0) {
+        throw new RuntimeException("\"${args.join(" ")}\" failed with exit code $exitCode. Output was: $output")
+    }
+
+    return output.trim()
 }