Update build scripts

Author: colemancda

Demo/build-swift-preview.sh

@@ -3,11 +3,7 @@ set -e
 source swift-define
 
 # Build with SwiftPM
-export JAVA_HOME=$SWIFT_ANDROID_SYSROOT/usr
-xcrun --toolchain swift swift build -c $SWIFT_COMPILATION_MODE \
-    --swift-sdk $SWIFT_TARGET_NAME \
-    --toolchain $XCTOOLCHAIN \
-    --package-path $SWIFT_PACKAGE_SRC
+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/

Demo/build-swift.sh

@@ -5,32 +5,17 @@ source swift-define
 # Install macOS dependencies
 if [[ $OSTYPE == 'darwin'* ]]; then
     echo "Install macOS build dependencies"
+    brew install skiptools/skip/skip
+    brew update
     HOMEBREW_NO_AUTO_UPDATE=1 brew install wget cmake ninja android-ndk
-
-    # Verify toolchain installed
-    if [ ! -d ${XCTOOLCHAIN} ]
-    then
-        echo "Please install the swift-6.0.3-RELEASE toolchain (or set XCTOOLCHAIN)"
-        echo "On Mac: https://download.swift.org/swift-6.0.3-release/xcode/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-osx.pkg"
-        exit 1
-    fi
-fi
-
-# Check swift-autolink-extract exists
-if [[ ! -f "${XCTOOLCHAIN}/usr/bin/swift-autolink-extract" ]];
-then
-    echo "Missing symlink '${XCTOOLCHAIN}/usr/bin/swift-autolink-extract'."
-    echo "We need 'sudo' permission to create it (just this once)."
-    sudo ln -s swift ${XCTOOLCHAIN}/usr/bin/swift-autolink-extract || exit 1
 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_SYSROOT/usr/lib/$ANDROID_LIB/*.so \
+cp -rf $SWIFT_ANDROID_LIBS/*.so \
     $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
 # Copy C stdlib
 cp -rf $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so \
     $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-# Copy Swift dependencies
-cp -rf $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libandroid-spawn.so \
-    $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+echo "Copied Swift libraries"

Demo/setup.sh

@@ -6,16 +6,19 @@ ANDROID_LIB="${ANDROID_LIB:=aarch64-linux-android}"
 SWIFT_COMPILATION_MODE="${SWIFT_COMPILATION_MODE:=debug}"
 
 # Version
-ANDROID_NDK_VERSION=24
-SWIFT_VERSION_SHORT=6.0.3
+ANDROID_SDK_VERSION=29
+SWIFT_VERSION_SHORT=6.1.1
 SWIFT_VERSION=swift-$SWIFT_VERSION_SHORT-RELEASE
-SWIFT_TARGET_NAME=$SWIFT_TARGET_ARCH-unknown-linux-android$ANDROID_NDK_VERSION
+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
 
 # Paths
-SWIFT_SDK=swift-$SWIFT_VERSION_SHORT-release-android-$ANDROID_NDK_VERSION-sdk
-SWIFT_ANDROID_SYSROOT=~/.swiftpm/swift-sdks/swift-$SWIFT_VERSION_SHORT-RELEASE-android-24-0.1.artifactbundle/$SWIFT_SDK/android-27c-sysroot
+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_PACKAGE_SRC=$SRC_ROOT
+JAVA_HOME=$SWIFT_ANDROID_SYSROOT/usr
 
 # Configurable
 SWIFT_NATIVE_PATH="${SWIFT_NATIVE_PATH:=$XCTOOLCHAIN/usr/bin}"