Merge branch 'development'

.travis.yml

@@ -31,7 +31,7 @@ deploy:
   provider: releases
   api_key:
     secure: ppMWm5zS3NfplInwq+JdBBLFgTPVvpLrTeqcTdpHRBLtoiKHtfiPDVhvRKshu5qdbp+h1L0ZWTxfXdmOzYxdrXlLQkUAMFIlj7kY+hfzBcSnfA707dJapx6Q9LeJCy50JuDXEx+hPCjNAREz6+YP1Cb5FVwFoC3pu0FQ0Qg+86uUy4D3jZDMmjHIg0qN+sdwOf1xTmLJ37nuoDSpsUWx4MDMh/RP/7Uwz9lxYBw1XcWlddZzHesLj0HUuRmRSrk/4KNEQsYavH2U+vgPnRuWVITuB/Y2LqLE+pleNCt5NiqVvSHZgRTSYu4Jik7ivaNa+JuVjeAokJubRv1wUba3wlU25fUfzeBvm1bxGbF+7HofZSaaUvK28JP1e/LYR8EfwPy4L+yfasEGh5McTKjsdKKK+c8wrvR1EaPwNe7bPy0YOeHfxf2/aTR8PoEqPQdzLo2VIIMdqEvChiE7Z6X2WgPBxbGoBp5NOL3uRhE/9aAyMSIt/sYZvtSmbtxfK5qCEMP0j2cNRs0d91DaL9nsnEFYu9jrddwX68HgtWmt77MdGAYMz5vyQPQtJuKKATST3HkKDvWyoWcNgnF4xL0U0bOZZcBGilZDuvEAqSSyw7oCXTnbh0B+pCpo6NOaV4ks62klmAbaC3IPAOvajlgViB6sHsknixys/Z1VkQjI5YY=
-  file: "$TRAVIS_BUILD_DIR/YarnSpinner/bin/Release/YarnSpinner.dll"
+#  file: "$TRAVIS_BUILD_DIR/YarnSpinner/bin/Release/YarnSpinner.dll"
   skip_cleanup: true
   on:
       tags: true

package.sh

@@ -99,11 +99,11 @@ echo "Building Yarn Spinner..."
 if [ $SOURCE_BUILD == 1 ]; then
     echo "Removing YarnSpinner.dll..."
     # Remove the built DLL from the Unity project (we built it to ensure that it actually works)
-    rm -v "Unity/Assets/Yarn Spinner/Code/YarnSpinner.dll"
+    rm -v "Unity/Assets/YarnSpinner/Code/YarnSpinner.dll"
 
     echo "Copying Yarn Spinner source in..."
     # Copy the source files in
-    cp -v "$SOURCE_FILES" "Unity/Assets/Yarn Spinner/Code/"
+    cp -v "$SOURCE_FILES" "Unity/Assets/YarnSpinner/Code/"
 
 fi
 
@@ -131,7 +131,7 @@ if [ $NO_EXAMPLES == 1 ]; then
 fi
 
 # sanity check that the examples folder is where we expect
-expected_examples_location="$(pwd)/Unity/Assets/Yarn Spinner/Examples"
+expected_examples_location="$(pwd)/Unity/Assets/YarnSpinner/Examples"
 
 if [ ! -d "$expected_examples_location" ]; then
     echo "Failed to find Examples folder at $expected_examples_location"
@@ -160,7 +160,7 @@ UNITY="$(mdfind "kind:application Unity.app" | grep -vE "b[0-9]+" | sort | tail
 if [[ -f $UNITY ]]; then
     echo "Using $UNITY"
 
-    ASSET_PATH="Assets/Yarn Spinner"
+    ASSET_PATH="Assets/YarnSpinner"
 
     # Disable stop-on-error for this - we want better reporting
     set +e