Merge branch 'master' into master

watson-developer-cloud · Aug 9, 2017 · e3e8e8f · e3e8e8f
2 parents f0c142e + 3313ff0
commit e3e8e8f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ install: true
 
 script:
 - ./gradlew build jacocoTestReport
-- ./gradlew generateDebugJavadoc
+- ./gradlew generateReleaseJavadoc
 - echo no | android create avd --force -n test -t $API --abi $ABI
 - emulator -avd test -no-skin -no-audio -no-window &
 - android-wait-for-emulator

diff --git a/.utility/push-javadoc-to-gh-pages.sh b/.utility/push-javadoc-to-gh-pages.sh
@@ -10,7 +10,6 @@ if [ "$TRAVIS_REPO_SLUG" == "watson-developer-cloud/android-sdk" ] && [ "$TRAVIS
     # on tagged builds, $TRAVIS_BRANCH is the tag (e.g. v1.2.3), otherwise it's the branch name (e.g. master)
     rm -rf docs/$TRAVIS_BRANCH
     mkdir -p docs/$TRAVIS_BRANCH
-
     cp -rf ../library/javaDoc/release/* docs/$TRAVIS_BRANCH
     ../.utility/generate_index_html.sh > index.html