Merge pull request #10 from leitdeux/update-swift-sdk

Update project to support Swift 4.2 and swift-sdk 1.1.0

Author: Anthony Oliveri

Cartfile.resolved

@@ -1,4 +1 @@
-github "daltoniam/Starscream" "3.0.4"
-github "daltoniam/common-crypto-spm" "1.1.0"
-github "daltoniam/zlib-spm" "1.1.0"
-github "watson-developer-cloud/swift-sdk" "v0.21.0"
+github "watson-developer-cloud/swift-sdk" "1.1.0"

README.md

@@ -23,14 +23,14 @@ Run `carthage update --platform iOS` in the command line.
 ### Getting Started
 
 1. Log in and create the service:
-	1. Go to the [Text to Speech][sign_up] service on Bluemix and either sign up for a free account or log into your Bluemix account. 
+	1. Go to the [Text to Speech][sign_up] service on Bluemix and either sign up for a free account or log into your Bluemix account.
 	2. Give your service a service name, and then click **Create**.
 2. On the new page that loads, Select **Service Credentials** and then **View Credentials** to get your authentication information.
-3. Update the `TextToSpeechUsername` and `TextToSpeechPassword` properties in `Credentials.swift`.
+3. Update the `TextToSpeechApiKey` property in `Credentials.swift`.
 4. Run the following command from the home directory to ignore new changes to the `Credentials.swift` file:
 
 	```sh
-	$ git update-index --assume-unchanged Text\ to\ Speech/Credentials.swift 
+	$ git update-index --assume-unchanged Text\ to\ Speech/Credentials.swift
 	```
 
 ## License

Text to Speech/AppDelegate.swift

@@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

Text to Speech/Credentials.swift

@@ -15,6 +15,5 @@
  **/
 
 struct Credentials {
-    static let TextToSpeechUsername = "your-username-here"
-    static let TextToSpeechPassword = "your-password-here"
+    static let TextToSpeechApiKey = "your-api-key"
 }

Text to Speech/ViewController.swift

@@ -52,10 +52,7 @@ class ViewController: UIViewController {
         super.viewDidLoad()
 
         // Instantiate Text to Speech service
-        textToSpeech = TextToSpeech(
-            username: Credentials.TextToSpeechUsername,
-            password: Credentials.TextToSpeechPassword
-        )
+        textToSpeech = TextToSpeech(apiKey: Credentials.TextToSpeechApiKey)
 
         // Load the supported voices
         loadVoices()
@@ -84,11 +81,21 @@ class ViewController: UIViewController {
     }
 
     func loadVoices() {
-        let failure = { (error: Error) in print(error) }
-        textToSpeech.getVoices(failure: failure) { voices in
+        textToSpeech.listVoices { (response, error) in
+            if let error = error {
+                print(error)
+                return
+            }
+            
+            guard let voices = response?.result?.voices else {
+                print("Failed to get voices")
+                return
+            }
+            
             for voice in voices {
                 self.voices.append(voice.name)
             }
+            
             DispatchQueue.main.async {
                 self.voicesTableView.reloadData()
             }
@@ -97,8 +104,8 @@ class ViewController: UIViewController {
 
     /** Error handling to make sure user fills in required fields before speaking. */
     func alertUser(title: String, text: String) {
-        let alert = UIAlertController(title: title, message: text, preferredStyle: UIAlertControllerStyle.alert)
-        alert.addAction(UIAlertAction(title: "Dismiss", style: UIAlertActionStyle.default, handler: nil))
+        let alert = UIAlertController(title: title, message: text, preferredStyle: UIAlertController.Style.alert)
+        alert.addAction(UIAlertAction(title: "Dismiss", style: UIAlertAction.Style.default, handler: nil))
         self.present(alert, animated: true, completion: nil)
     }
 
@@ -125,14 +132,16 @@ class ViewController: UIViewController {
         }
 
         // Synthesize the text
-        let failure = { (error: Error) in print(error) }
-        textToSpeech.synthesize(
-            text,
-            voice: voice,
-            audioFormat: .wav,
-            failure: failure)
-        {
-            data in
+        textToSpeech.synthesize(text: text, accept: "audio/wav", voice: voice) { (response, error) in
+            if let error = error {
+                print(error)
+            }
+            
+            guard let data = response?.result else {
+                print("Failed to synthesize text")
+                return
+            }
+            
             do {
                 self.player = try AVAudioPlayer(data: data)
                 self.player!.play()