Merge branch 'develop' of github.com:watson-developer-cloud/unity-sdk into develop

Author: mediumTaj

.travis.yml

@@ -2,8 +2,18 @@ language: objective-c
 osx_image: xcode61
 rvm:
 - 2.1.2
+cache:
+  directories:
+    - ./Unity
+before_install:
+- chmod a+x ./Travis/installUnity.sh
 install:
 - ./Travis/installUnity.sh
+before_script:
+- chmod a+x ./Travis/createProject.sh
+- chmod a+x ./Travis/installSDK.sh
+- chmod a+x ./Travis/runTests.sh
+- chmod a+x ./Travis/build.sh
 script:
 - ./Travis/createProject.sh
 - ./Travis/installSDK.sh

Config.json.enc

@@ -18,4 +18,4 @@ Be sure a microphone is connected and enabled on your computer. Play the scene i
 [text_to_speech]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/text-to-speech/
 [language_translation]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translation/
 [dialog]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/dialog/
-[natural_language_classifier]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/nl-classifier/
+[natural_language_classifier]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/natural-language-classifier/index.html

Examples/WidgetExamples/README.md

@@ -2442,7 +2442,7 @@ See [CONTRIBUTING.md](.github/CONTRIBUTING.md).
 [text_to_speech]: http://www.ibm.com/watson/developercloud/doc/text-to-speech/
 [language_translator]: http://www.ibm.com/watson/developercloud/doc/language-translator/
 [dialog]: http://www.ibm.com/watson/developercloud/doc/dialog/
-[natural_language_classifier]: http://www.ibm.com/watson/developercloud/doc/nl-classifier/
+[natural_language_classifier]: http://www.ibm.com/watson/developercloud/doc/natural-language-classifier/index.html
 
 [alchemy_language]: http://www.alchemyapi.com/products/alchemylanguage
 [alchemyData_news]: http://www.ibm.com/watson/developercloud/alchemy-data-news.html

README.md

@@ -1,30 +1,40 @@
 #! /bin/sh
-project="unity-sdk-travis"
+
+set -e
 
 BASE_URL=http://netstorage.unity3d.com/unity
-HASH=fdbb5133b820
-VERSION=5.3.4f1
+HASH=38b4efef76f0
+VERSION=5.5.0f3
 
 download() {
-  file=$1
-  url="$BASE_URL/$HASH/$package"
+ file=$1
+ url="$BASE_URL/$HASH/$package"
 
-  echo "Downloading from $url: "
-  curl -o `basename "$package"` "$url"
+ echo "Downloading from $url: "
+ cd Unity
+ curl -o `basename "$package"` "$url"
+ cd ../
 }
 
 install() {
-  package=$1
-  download "$package"
+ package=$1
+ filename=`basename "$package"`
+ packagePath="Unity/$filename"
+ if [ ! -f $packagePath ] ; then
+   echo "$packagePath not found. downloading `basename "$packagePath"`"
+   download "$package"
+ fi
 
-  echo "Installing "`basename "$package"`
-  sudo installer -dumplog -package `basename "$package"` -target /
+ echo "Installing "`basename "$package"`
+ sudo installer -dumplog -package $packagePath -target /
 }
 
-# See $BASE_URL/$HASH/unity-$VERSION-$PLATFORM.ini for complete list
-# of available packages, where PLATFORM is `osx` or `win`
+if [ ! -d "Unity" ] ; then
+ mkdir -p -m 777 Unity
+fi
 
 install "MacEditorInstaller/Unity-$VERSION.pkg"
 install "MacEditorTargetInstaller/UnitySetup-Windows-Support-for-Editor-$VERSION.pkg"
-install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg"
-# install "MacEditorTargetInstaller/UnitySetup-Linux-Support-for-Editor-$VERSION.pkg"
+
+#"Mac Target Support - now part of Editor as default player instead of web player"
+#install "MacEditorTargetInstaller/UnitySetup-Mac-Support-for-Editor-$VERSION.pkg"