Compile for Previews

Author: colemancda

Demo/app/src/main/java/com/pureswift/swiftandroid/MainActivity.kt

@@ -20,8 +20,6 @@ class MainActivity : ComponentActivity() {
     }
 
     private fun loadNativeLibrary() {
-        System.loadLibrary("icuuc")
-        System.loadLibrary("icui18n")
         System.loadLibrary("Foundation")
         System.loadLibrary("SwiftAndroidApp")
     }
@@ -45,6 +43,14 @@ class MainActivity : ComponentActivity() {
 
 class MainActivityHello {
 
+    init {
+        loadNativeLibrary()
+    }
+
+    private fun loadNativeLibrary() {
+        System.loadLibrary("SwiftAndroidApp")
+    }
+
     external fun sayHelloName(): String
 }
 
@@ -60,6 +66,6 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
 @Composable
 fun GreetingPreview() {
     SwiftAndroidTheme {
-        Greeting("Android")
+        Greeting(MainActivityHello().sayHelloName())
     }
 }

Demo/build-swift.sh

@@ -3,12 +3,21 @@ set -e
 source swift-define
 
 # Build with SwiftPM
-xcrun --toolchain swift swift build -c debug \
-    --swift-sdk aarch64-unknown-linux-android24 \
+xcrun --toolchain swift swift build -c $SWIFT_COMPILATION_MODE \
+    --swift-sdk $SWIFT_TARGET_NAME \
     --toolchain $XCTOOLCHAIN \
     --package-path $SWIFT_PACKAGE_SRC
 
 # Copy compiled Swift package
 mkdir -p $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-cp -rf $SWIFT_PACKAGE_SRC/.build/aarch64-unknown-linux-android24/debug/libSwiftAndroidApp.so \
+cp -rf $SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftAndroidApp.so \
     $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+
+# Build locally for preview
+xcrun --toolchain swift swift build -c $SWIFT_COMPILATION_MODE \
+    --package-path $SWIFT_PACKAGE_SRC
+
+# Copy to default Java JNI path
+mkdir -p ~/Library/Java/Extensions
+cp -rf $SWIFT_PACKAGE_SRC/.build/arm64-apple-macosx/debug/libSwiftAndroidApp.dylib \
+    ~/Library/Java/Extensions/

Demo/swift-define

@@ -3,6 +3,7 @@ SRC_ROOT="${SRC_ROOT:=$(pwd)}"
 SWIFT_TARGET_ARCH="${SWIFT_TARGET_ARCH:=aarch64}"
 ANDROID_ARCH="${ANDROID_ARCH:=arm64-v8a}"
 ANDROID_LIB="${ANDROID_LIB:=aarch64-linux-android}"
+SWIFT_COMPILATION_MODE="${SWIFT_COMPILATION_MODE:=debug}"
 
 # Version
 ANDROID_NDK_VERSION=24