From 5866149a233af58ecdd79729a8b7670b02696e3b Mon Sep 17 00:00:00 2001
From: Konrad 'ktoso' Malawski <ktoso@apple.com>
Date: Wed, 25 Jun 2025 09:23:59 +0900
Subject: [PATCH 1/2] CI: Make sure ci-validate exits when ANY command fails

---
 .github/scripts/validate_sample.sh       | 14 +++++++-------
 Samples/SwiftKitSampleApp/ci-validate.sh |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100755 Samples/SwiftKitSampleApp/ci-validate.sh

diff --git a/.github/scripts/validate_sample.sh b/.github/scripts/validate_sample.sh
index 7e0ab3d2..b5780976 100755
--- a/.github/scripts/validate_sample.sh
+++ b/.github/scripts/validate_sample.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e
+set -x
+
 # shellcheck disable=SC2034
 declare -r GREEN='\033[0;32m'
 declare -r BOLD='\033[1m'
@@ -14,14 +17,11 @@ echo "========================================================================"
 printf "Validate sample '${BOLD}%s${RESET}' using: " "$sampleDir"
 cd "$sampleDir" || exit
 if [[ $(find . -name ${CI_VALIDATE_SCRIPT} -maxdepth 1) ]]; then
-  echo -e "Custom ${BOLD}${CI_VALIDATE_SCRIPT}${RESET} script..."
-  ./${CI_VALIDATE_SCRIPT} || exit
-elif [[ $(find . -name 'build.gradle*' -maxdepth 1) ]]; then
-  echo -e "${BOLD}Gradle${RESET} build..."
-  ./gradlew build || ./gradlew build --info # re-run to get better failure output
+  echo -e "Run ${BOLD}${CI_VALIDATE_SCRIPT}${RESET} script..."
+  ./${CI_VALIDATE_SCRIPT}
 else
-  echo -e "${BOLD}SwiftPM${RESET} build..."
-  swift build || exit
+  echo -e "${BOLD}Missing ${CI_VALIDATE_SCRIPT} file!${RESET}"
+  exit
 fi
 
 echo -e "Validated sample '${BOLD}${sampleDir}${RESET}': ${BOLD}passed${RESET}."
diff --git a/Samples/SwiftKitSampleApp/ci-validate.sh b/Samples/SwiftKitSampleApp/ci-validate.sh
new file mode 100755
index 00000000..07b42627
--- /dev/null
+++ b/Samples/SwiftKitSampleApp/ci-validate.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -x
+set -e
+
+./gradlew run
\ No newline at end of file

From 0dc3f3ed4018ebfb74c933bd37c4de84814bfc72 Mon Sep 17 00:00:00 2001
From: Konrad 'ktoso' Malawski <ktoso@apple.com>
Date: Wed, 25 Jun 2025 09:24:50 +0900
Subject: [PATCH 2/2] Workaround: bring back max-length pointer sequence layout

---
 .../src/main/java/org/swift/swiftkit/SwiftValueLayout.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueLayout.java b/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueLayout.java
index 8d2d7ad2..00215ef0 100644
--- a/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueLayout.java
+++ b/SwiftKit/src/main/java/org/swift/swiftkit/SwiftValueLayout.java
@@ -41,8 +41,10 @@ public static long addressByteSize() {
     public static final ValueLayout.OfLong SWIFT_INT64 = ValueLayout.JAVA_LONG;
     public static final ValueLayout.OfFloat SWIFT_FLOAT = ValueLayout.JAVA_FLOAT;
     public static final ValueLayout.OfDouble SWIFT_DOUBLE = ValueLayout.JAVA_DOUBLE;
-    public static final AddressLayout SWIFT_POINTER = ValueLayout.ADDRESS;
-            // .withTargetLayout(MemoryLayout.sequenceLayout(Long.MAX_VALUE, JAVA_BYTE));
+
+    // FIXME: this sequence layout is a workaround, we must properly size pointers when we get them.
+    public static final AddressLayout SWIFT_POINTER = ValueLayout.ADDRESS
+           .withTargetLayout(MemoryLayout.sequenceLayout(Long.MAX_VALUE, JAVA_BYTE));
     public static final SequenceLayout SWIFT_BYTE_ARRAY = MemoryLayout.sequenceLayout(8, ValueLayout.JAVA_BYTE);
 
     /**