Merge pull request #23 from PureSwift/feature/fix-demo-skip-android

colemancda · web-flow · commit 01093827a392 · 2026-02-15T16:24:20.000-05:00
Fix Demo app build script
diff --git a/Demo/app/build.gradle.kts b/Demo/app/build.gradle.kts
@@ -52,18 +52,18 @@ android {
             )
         }
     }
-/*
-    // Custom Swift build task
-    val buildSwift by tasks.registering(Exec::class) {
-        group = "build"
-        description = "Build Swift sources"
-        workingDir("$projectDir")
-        commandLine("bash", "build-swift.sh")
-    }
+}
 
-    tasks.withType<JavaCompile> {
-        dependsOn(buildSwift)
-    }*/
+// Compile native Swift code for the demo app with `skip android build`.
+val buildSwift by tasks.registering(Exec::class) {
+    group = "build"
+    description = "Build native Swift sources for Android"
+    workingDir(rootProject.projectDir)
+    commandLine("bash", "build-swift.sh")
+}
+
+tasks.named("preBuild") {
+    dependsOn(buildSwift)
 }
 
 dependencies {
@@ -86,4 +86,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-}
+}
diff --git a/Demo/app/src/main/swift/ListViewAdapter.swift b/Demo/app/src/main/swift/ListViewAdapter.swift
@@ -6,6 +6,8 @@
 //
 
 import Foundation
+import SwiftJava
+import JavaUtil
 import AndroidKit
 
 @JavaClass("com.pureswift.swiftandroid.ListViewAdapter", extends: ListAdapter.self)
diff --git a/Demo/app/src/main/swift/MainActivity.swift b/Demo/app/src/main/swift/MainActivity.swift
@@ -8,7 +8,9 @@
 import Foundation
 import AndroidKit
 import JavaLang
+#if canImport(Binder)
 import Binder
+#endif
 
 @JavaClass("com.pureswift.swiftandroid.MainActivity")
 open class MainActivity: AndroidApp.Activity {
@@ -64,9 +66,11 @@ private extension MainActivity {
         //setRootView()
         startEmitterTimer()
         
+        #if canImport(Binder)
         Task {
             printBinderVersion()
         }
+        #endif
     }
     
     func runAsync() {
@@ -338,6 +342,7 @@ private extension MainActivity {
             .commit()
     }
     
+    #if canImport(Binder)
     private func printBinderVersion() {
         // Print Binder version
         do {
@@ -348,6 +353,7 @@ private extension MainActivity {
             logError("Unable to read binder: \(error)")
         }
     }
+    #endif
 }
 
 extension MainActivity {
diff --git a/Demo/build-swift.sh b/Demo/build-swift.sh
@@ -1,11 +1,32 @@
 #!/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"
 
 # Build with SwiftPM
-ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION=$ANDROID_SDK_VERSION skip android build --arch $SWIFT_TARGET_ARCH --android-api-level $ANDROID_SDK_VERSION
+ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION="$ANDROID_SDK_VERSION" skip android build --arch "$SWIFT_TARGET_ARCH" --android-api-level "$ANDROID_SDK_VERSION"
 
 # Copy compiled Swift package
-mkdir -p $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-cp -rf $SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftAndroidApp.so \
-    $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+mkdir -p "$JNI_LIBS_DIR/"
+cp -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftAndroidApp.so" "$JNI_LIBS_DIR/"
+
+# Copy Swift runtime shared libraries required by libSwiftAndroidApp.so.
+if [[ -d "$SWIFT_ANDROID_RUNTIME_LIBS" ]]; then
+    shopt -s nullglob
+    for so in "$SWIFT_ANDROID_RUNTIME_LIBS"/*.so; do
+        cp -f "$so" "$JNI_LIBS_DIR/"
+    done
+    shopt -u nullglob
+fi
+
+# Copy SwiftJava helper library when available.
+if [[ -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftJava.so" ]]; then
+    cp -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftJava.so" "$JNI_LIBS_DIR/"
+fi
+
+# Copy C++ runtime from Android sysroot.
+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/"
+fi
diff --git a/Demo/setup.sh b/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_RUNTIME_LIBS" ]]; then
+    shopt -s nullglob
+    for so in "$SWIFT_ANDROID_RUNTIME_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"
diff --git a/Demo/swift-define b/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,17 @@ 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_ANDROID_RUNTIME_LIBS="$SWIFT_ANDROID_LIBS/android"
 SWIFT_PACKAGE_SRC=$SRC_ROOT
 JAVA_HOME=$SWIFT_ANDROID_SYSROOT/usr
 
diff --git a/Sources/AndroidKit/AndroidKit.swift b/Sources/AndroidKit/AndroidKit.swift
@@ -14,6 +14,9 @@ import AndroidNDK
 @_exported import JavaNet
 @_exported import JavaUtilFunction
 @_exported import JavaLang
+@_exported import JavaLangUtil
+@_exported import JavaLangIO
+@_exported import JavaLangNet
 @_exported import AndroidOS
 @_exported import AndroidContent
 @_exported import AndroidUtil

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`	`import Foundation`
`9`	`9`	`import AndroidKit`
`10`	`10`	`import JavaLang`
	`11`	`+#if canImport(Binder)`
`11`	`12`	`import Binder`
	`13`	`+#endif`
`12`	`14`
`13`	`15`	`@JavaClass("com.pureswift.swiftandroid.MainActivity")`
`14`	`16`	`open class MainActivity: AndroidApp.Activity {`
`@@ -64,9 +66,11 @@ private extension MainActivity {`
`64`	`66`	`//setRootView()`
`65`	`67`	`startEmitterTimer()`
`66`	`68`
	`69`	`+ #if canImport(Binder)`
`67`	`70`	`Task {`
`68`	`71`	`printBinderVersion()`
`69`	`72`	`}`
	`73`	`+ #endif`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`func runAsync() {`
`@@ -338,6 +342,7 @@ private extension MainActivity {`
`338`	`342`	`.commit()`
`339`	`343`	`}`
`340`	`344`
	`345`	`+ #if canImport(Binder)`
`341`	`346`	`private func printBinderVersion() {`
`342`	`347`	`// Print Binder version`
`343`	`348`	`do {`
`@@ -348,6 +353,7 @@ private extension MainActivity {`
`348`	`353`	`logError("Unable to read binder: \(error)")`
`349`	`354`	`}`
`350`	`355`	`}`
	`356`	`+ #endif`
`351`	`357`	`}`
`352`	`358`
`353`	`359`	`extension MainActivity {`