Update build script

Author: colemancda

Demo/setup.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
-set -e
-source swift-define
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/swift-define"
+JNI_LIBS_DIR="$SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH"
 
 # Install macOS dependencies
 if [[ $OSTYPE == 'darwin'* ]]; then
@@ -12,11 +15,38 @@ if [[ $OSTYPE == 'darwin'* ]]; then
 fi
 
 # Copy Swift libraries
-rm -rf $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-mkdir -p $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-cp -rf $SWIFT_ANDROID_LIBS/*.so \
-    $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+rm -rf "$JNI_LIBS_DIR/"
+mkdir -p "$JNI_LIBS_DIR/"
+
+copied_swift_libs=0
+if [[ -d "$SWIFT_ANDROID_LIBS" ]]; then
+    shopt -s nullglob
+    for so in "$SWIFT_ANDROID_LIBS"/*.so; do
+        cp -f "$so" "$JNI_LIBS_DIR/"
+        copied_swift_libs=1
+    done
+    shopt -u nullglob
+fi
+
+# Fallback for newer Skip/Swift SDK layouts where runtime libs are emitted into `.build`.
+if [[ $copied_swift_libs -eq 0 && -d "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug" ]]; then
+    shopt -s nullglob
+    for so in "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug"/libSwift*.so; do
+        cp -f "$so" "$JNI_LIBS_DIR/"
+        copied_swift_libs=1
+    done
+    shopt -u nullglob
+fi
+
+if [[ $copied_swift_libs -eq 0 ]]; then
+    echo "Warning: No Swift runtime libraries found to copy."
+fi
+
 # Copy C stdlib
-cp -rf $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so \
-    $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+if [[ -f "$SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so" ]]; then
+    cp -f "$SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so" \
+        "$JNI_LIBS_DIR/"
+else
+    echo "Warning: libc++_shared.so not found at $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so"
+fi
 echo "Copied Swift libraries"

Demo/swift-define

@@ -1,5 +1,6 @@
 # Configurable
-SRC_ROOT="${SRC_ROOT:=$(pwd)}"
+SWIFT_DEFINE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SRC_ROOT="${SRC_ROOT:=$SWIFT_DEFINE_DIR}"
 SWIFT_TARGET_ARCH="${SWIFT_TARGET_ARCH:=aarch64}"
 ANDROID_ARCH="${ANDROID_ARCH:=arm64-v8a}"
 ANDROID_LIB="${ANDROID_LIB:=aarch64-linux-android}"
@@ -11,12 +12,16 @@ SWIFT_VERSION_SHORT=6.2.3
 SWIFT_VERSION=swift-$SWIFT_VERSION_SHORT-RELEASE
 SWIFT_TARGET_NAME=$SWIFT_TARGET_ARCH-unknown-linux-android$ANDROID_SDK_VERSION
 XCTOOLCHAIN=/Library/Developer/Toolchains/$SWIFT_VERSION.xctoolchain
-SWIFT_ARTIFACT_BUNDLE=swift-$SWIFT_VERSION_SHORT-RELEASE-android-0.1.artifactbundle
+SWIFT_ARTIFACT_BUNDLE="${SWIFT_ARTIFACT_BUNDLE:=swift-$SWIFT_VERSION_SHORT-RELEASE_android.artifactbundle}"
+SWIFT_SDKS_ROOT="${SWIFT_SDKS_ROOT:=$HOME/Library/org.swift.swiftpm/swift-sdks}"
+if [[ ! -d "$SWIFT_SDKS_ROOT/$SWIFT_ARTIFACT_BUNDLE" ]]; then
+    SWIFT_SDKS_ROOT="$HOME/.swiftpm/swift-sdks"
+fi
 
 # Paths
 SWIFT_SDK=swift-$SWIFT_VERSION_SHORT-release-android-$ANDROID_SDK_VERSION-sdk
-SWIFT_ANDROID_SYSROOT=~/.swiftpm/swift-sdks/$SWIFT_ARTIFACT_BUNDLE/swift-android/ndk-sysroot
-SWIFT_ANDROID_LIBS=~/.swiftpm/swift-sdks/$SWIFT_ARTIFACT_BUNDLE/swift-android/swift-resources/usr/lib/swift-$SWIFT_TARGET_ARCH/android/
+SWIFT_ANDROID_SYSROOT="$SWIFT_SDKS_ROOT/$SWIFT_ARTIFACT_BUNDLE/swift-android/ndk-sysroot"
+SWIFT_ANDROID_LIBS="$SWIFT_SDKS_ROOT/$SWIFT_ARTIFACT_BUNDLE/swift-android/swift-resources/usr/lib/swift-$SWIFT_TARGET_ARCH"
 SWIFT_PACKAGE_SRC=$SRC_ROOT
 JAVA_HOME=$SWIFT_ANDROID_SYSROOT/usr