diff --git a/IBMWatsonAssistantV1.podspec b/IBMWatsonAssistantV1.podspec index df12122a1..985f7eac9 100644 --- a/IBMWatsonAssistantV1.podspec +++ b/IBMWatsonAssistantV1.podspec @@ -9,8 +9,7 @@ natural-language input and uses machine learning to respond to customers in a wa DESC s.homepage = 'https://www.ibm.com/watson/ai-assistant/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'Assistant' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonAssistantV2.podspec b/IBMWatsonAssistantV2.podspec index 458209ac9..3eaeff53f 100644 --- a/IBMWatsonAssistantV2.podspec +++ b/IBMWatsonAssistantV2.podspec @@ -9,8 +9,7 @@ natural-language input and uses machine learning to respond to customers in a wa DESC s.homepage = 'https://www.ibm.com/watson/ai-assistant/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'Assistant' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonCompareComplyV1.podspec b/IBMWatsonCompareComplyV1.podspec index 80fcab65a..a06c12882 100644 --- a/IBMWatsonCompareComplyV1.podspec +++ b/IBMWatsonCompareComplyV1.podspec @@ -8,7 +8,7 @@ IBM Watson™ Compare and Comply analyzes governing documents to provide details DESC s.homepage = 'https://www.ibm.com/blogs/watson/2018/02/watson-compare-comply/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'CompareComply' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonDiscoveryV1.podspec b/IBMWatsonDiscoveryV1.podspec index 6fcd49b12..09dc32303 100644 --- a/IBMWatsonDiscoveryV1.podspec +++ b/IBMWatsonDiscoveryV1.podspec @@ -10,8 +10,7 @@ as well as public and third-party data. DESC s.homepage = 'https://www.ibm.com/watson/services/discovery/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'Discovery' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonLanguageTranslatorV3.podspec b/IBMWatsonLanguageTranslatorV3.podspec index c5d913761..b8712167c 100644 --- a/IBMWatsonLanguageTranslatorV3.podspec +++ b/IBMWatsonLanguageTranslatorV3.podspec @@ -8,8 +8,7 @@ IBM Watson™ Language Translator can identify the language of text and translat DESC s.homepage = 'https://www.ibm.com/watson/services/language-translator/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'LanguageTranslator' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonNaturalLanguageClassifierV1.podspec b/IBMWatsonNaturalLanguageClassifierV1.podspec index e4b4b12b0..7d2ab8832 100644 --- a/IBMWatsonNaturalLanguageClassifierV1.podspec +++ b/IBMWatsonNaturalLanguageClassifierV1.podspec @@ -10,8 +10,7 @@ return information for texts that it is not trained on. DESC s.homepage = 'https://www.ibm.com/watson/services/natural-language-classifier/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'NaturalLanguageClassifier' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonNaturalLanguageUnderstandingV1.podspec b/IBMWatsonNaturalLanguageUnderstandingV1.podspec index 50cea92dd..03eb70a60 100644 --- a/IBMWatsonNaturalLanguageUnderstandingV1.podspec +++ b/IBMWatsonNaturalLanguageUnderstandingV1.podspec @@ -9,8 +9,7 @@ including categories, concepts, emotion, entities, keywords, metadata, relations DESC s.homepage = 'https://www.ibm.com/watson/services/natural-language-understanding/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'NaturalLanguageUnderstanding' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonPersonalityInsightsV3.podspec b/IBMWatsonPersonalityInsightsV3.podspec index 100c06910..5b5cf6040 100644 --- a/IBMWatsonPersonalityInsightsV3.podspec +++ b/IBMWatsonPersonalityInsightsV3.podspec @@ -9,8 +9,7 @@ from digital communications such as email, text messages, tweets, and forum post DESC s.homepage = 'https://www.ibm.com/watson/services/personality-insights/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'PersonalityInsights' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonSpeechToTextV1.podspec b/IBMWatsonSpeechToTextV1.podspec index 4f819ded3..99fb23636 100644 --- a/IBMWatsonSpeechToTextV1.podspec +++ b/IBMWatsonSpeechToTextV1.podspec @@ -10,8 +10,7 @@ of the audio signal. It continuously returns and retroactively updates a transcr DESC s.homepage = 'https://www.ibm.com/watson/services/speech-to-text/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'SpeechToText' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonTextToSpeechV1.podspec b/IBMWatsonTextToSpeechV1.podspec index b352e6763..748b10022 100644 --- a/IBMWatsonTextToSpeechV1.podspec +++ b/IBMWatsonTextToSpeechV1.podspec @@ -9,8 +9,7 @@ The service streams the results back to the client with minimal delay. DESC s.homepage = 'https://www.ibm.com/watson/services/text-to-speech/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'TextToSpeech' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonToneAnalyzerV3.podspec b/IBMWatsonToneAnalyzerV3.podspec index 82d8c142d..7990d9aa0 100644 --- a/IBMWatsonToneAnalyzerV3.podspec +++ b/IBMWatsonToneAnalyzerV3.podspec @@ -9,8 +9,7 @@ The service can analyze tone at both the document and sentence levels. DESC s.homepage = 'https://www.ibm.com/watson/services/tone-analyzer/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'ToneAnalyzer' s.ios.deployment_target = '10.0' diff --git a/IBMWatsonVisualRecognitionV3.podspec b/IBMWatsonVisualRecognitionV3.podspec index b53322b91..047c3fe7e 100644 --- a/IBMWatsonVisualRecognitionV3.podspec +++ b/IBMWatsonVisualRecognitionV3.podspec @@ -9,8 +9,7 @@ scenes, objects, faces, and other content. The response includes keywords that p DESC s.homepage = 'https://www.ibm.com/watson/services/visual-recognition/' s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.authors = { 'Anthony Oliveri' => 'oliveri@us.ibm.com', - 'Mike Kistler' => 'mkistler@us.ibm.com' } + s.authors = { 'Mike Kistler' => 'mkistler@us.ibm.com' } s.module_name = 'VisualRecognition' s.ios.deployment_target = '10.0' diff --git a/Scripts/generate-documentation.sh b/Scripts/generate-documentation.sh index 2e70881cc..74dfeaadf 100755 --- a/Scripts/generate-documentation.sh +++ b/Scripts/generate-documentation.sh @@ -36,14 +36,7 @@ cd .. # Create folder for generated documentation ################################################################################ -if [ -d "${outdir}" ]; then - echo "The output directory ${outdir} already exists." - echo "Please remove the directory and try again." - exit -fi - -mkdir ${outdir} -mkdir ${outdir}/services +mkdir -p ${outdir}/services ################################################################################ # Run Jazzy to generate documentation @@ -60,6 +53,7 @@ for service in ${services[@]}; do --readme Source/${service}/README.md \ --documentation README.md \ --github_url https://github.com/watson-developer-cloud/swift-sdk \ + --copyright "© IBM Corp. 2016-$(date +%Y). (Last updated: $(date +%Y-%m-%d))" \ --hide-documentation-coverage done diff --git a/Scripts/travis/publish-documentation.sh b/Scripts/travis/publish-documentation.sh index a9344230d..b161c40ad 100755 --- a/Scripts/travis/publish-documentation.sh +++ b/Scripts/travis/publish-documentation.sh @@ -18,15 +18,17 @@ git fetch git checkout master latestVersion=$(git describe --abbrev=0 --tags) +git clone --quiet --branch=gh-pages git@github.com:watson-developer-cloud/swift-sdk.git gh-pages > /dev/null + +# Delete all the old docs (but not the docs directory -- this is hand written) +(cd gh-pages && git rm -rf css img index.html js services undocumented.json) + # Generate the API docs -./Scripts/generate-documentation.sh - -# Push newly-generated docs to the gh-pages branch -git checkout --track origin/gh-pages -# Delete old docs -rm -rf css img js services -cp -r gh-pages/* . -rm -rf gh-pages/ -git add . -git commit -m "SDK docs for release ${latestVersion}" -git push --set-upstream origin gh-pages +./Scripts/generate-documentation.sh gh-pages + +# Commit and push the newly generated API docs +pushd gh-pages + git add . + git commit -m "SDK docs for release ${latestVersion}" + git push +popd