Updated demo app

Author: colemancda

Demo/swift/Package.swift renamed to Demo/Package.swift

@@ -57,11 +57,7 @@ let package = Package(
     ],
     dependencies: [
         .package(
-            path: "../../"
-        ),
-        .package(
-            url: "https://github.com/PureSwift/swift-java.git",
-            branch: "feature/android"
+            path: "../"
         )
     ],
     targets: [
@@ -73,6 +69,7 @@ let package = Package(
                     package: "Android"
                 )
             ],
+            path: "./app/src/main/swift",
             swiftSettings: [
               .swiftLanguageMode(.v5),
               .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

Demo/swift/Sources/SwiftAndroidApp/Application.swift renamed to Demo/app/src/main/swift/Application.swift

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+source swift-define
+
+# 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/Sources/SwiftAndroidApp/HelloSubclass.swift renamed to Demo/app/src/main/swift/HelloSubclass.swift

@@ -12,12 +12,3 @@ xcrun --toolchain swift swift build -c $SWIFT_COMPILATION_MODE \
 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/
-
-# 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/Sources/SwiftAndroidApp/HelloSwift.swift renamed to Demo/app/src/main/swift/HelloSwift.swift

@@ -26,11 +26,11 @@ fi
 
 # Copy Swift libraries
 mkdir -p $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-cp -rf $SWIFT_SDK_PATH/usr/lib/$ANDROID_LIB/*.so \
+cp -rf $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/*.so \
     $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
 # Copy C stdlib
-cp -rf $SWIFT_SDK_PATH/usr/lib/$ANDROID_LIB/libc++_shared.so \
+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_SDK_PATH/usr/lib/$ANDROID_LIB/libandroid-spawn.so \
+cp -rf $SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libandroid-spawn.so \
     $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/