@capacitor-community/text-to-speech 6.0.0 → 6.1.0

package/CapacitorCommunityTextToSpeech.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage = package['repository']['url']
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '14.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'

package/Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapacitorCommunityTextToSpeech",
+    platforms: [.iOS(.v14)],
+    products: [
+        .library(
+            name: "CapacitorCommunityTextToSpeech",
+            targets: ["TextToSpeechPlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+    ],
+    targets: [
+        .target(
+            name: "TextToSpeechPlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Sources/TextToSpeechPlugin"),
+        .testTarget(
+            name: "TextToSpeechPluginTests",
+            dependencies: ["TextToSpeechPlugin"],
+            path: "ios/Tests/TextToSpeechPluginTests")
+    ]
+)

package/android/src/main/java/com/getcapacitor/community/tts/TextToSpeech.java

@@ -105,33 +105,22 @@ public class TextToSpeech implements android.speech.tts.TextToSpeech.OnInitListe
 
         Locale locale = Locale.forLanguageTag(lang);
 
-        if (Build.VERSION.SDK_INT >= 21) {
-            Bundle ttsParams = new Bundle();
-            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
-            ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
-
-            tts.setLanguage(locale);
-            tts.setSpeechRate(rate);
-            tts.setPitch(pitch);
-
-            if (voice >= 0) {
-                ArrayList<Voice> supportedVoices = getSupportedVoicesOrdered();
-                if (voice < supportedVoices.size()) {
-                    Voice newVoice = supportedVoices.get(voice);
-                    int resultCode = tts.setVoice(newVoice);
-                }
+        Bundle ttsParams = new Bundle();
+        ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
+        ttsParams.putSerializable(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
+
+        tts.setLanguage(locale);
+        tts.setSpeechRate(rate);
+        tts.setPitch(pitch);
+
+        if (voice >= 0) {
+            ArrayList<Voice> supportedVoices = getSupportedVoicesOrdered();
+            if (voice < supportedVoices.size()) {
+                Voice newVoice = supportedVoices.get(voice);
+                int resultCode = tts.setVoice(newVoice);
             }
-            tts.speak(text, queueStrategy, ttsParams, callbackId);
-        } else {
-            HashMap<String, String> ttsParams = new HashMap<>();
-            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, callbackId);
-            ttsParams.put(android.speech.tts.TextToSpeech.Engine.KEY_PARAM_VOLUME, Float.toString(volume));
-
-            tts.setLanguage(locale);
-            tts.setSpeechRate(rate);
-            tts.setPitch(pitch);
-            tts.speak(text, queueStrategy, ttsParams);
         }
+        tts.speak(text, queueStrategy, ttsParams, callbackId);
     }
 
     public void stop() {

package/ios/{Plugin → Sources/TextToSpeechPlugin}/TextToSpeechPlugin.swift

@@ -7,7 +7,17 @@ import AVFoundation
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(TextToSpeechPlugin)
-public class TextToSpeechPlugin: CAPPlugin {
+public class TextToSpeechPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "TextToSpeechPlugin" 
+    public let jsName = "TextToSpeech" 
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "speak", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "stop", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "openInstall", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getSupportedLanguages", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getSupportedVoices", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "isLanguageSupported", returnType: CAPPluginReturnPromise),
+    ] 
     private static let errorUnsupportedLanguage = "This language is not supported."
 
     private let implementation = TextToSpeech()

package/ios/Tests/TextToSpeechPluginTests/TextToSpeechPluginTests.swift

@@ -0,0 +1,16 @@
+import XCTest
+@testable import Plugin
+
+class TextToSpeechTests: XCTestCase {
+
+    func testEcho() {
+        // This is an example of a functional test case for a plugin.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+
+        let implementation = TextToSpeech()
+        let value = "Hello, World!"
+        let result = implementation.echo(value)
+
+        XCTAssertEqual(value, result)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/text-to-speech",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Capacitor plugin for synthesizing speech from text.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -8,7 +8,7 @@
   "unpkg": "dist/plugin.js",
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin -destination generic/platform=iOS && cd ..",
+    "verify:ios": "xcodebuild -scheme CapacitorCommunityTextToSpeech -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
@@ -50,7 +50,9 @@
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
     "CapacitorCommunityTextToSpeech.podspec"
   ],
   "repository": {

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

package/ios/Plugin/TextToSpeechPlugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/TextToSpeechPlugin.m

@@ -1,13 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(TextToSpeechPlugin, "TextToSpeech",
-           CAP_PLUGIN_METHOD(speak, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(stop, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(openInstall, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getSupportedLanguages, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getSupportedVoices, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(isLanguageSupported, CAPPluginReturnPromise);
-)