Merge pull request #20 from Pantrist-dev/migrate-cap-3

feat: migrate to capacitor 3

Author: mrbatista

CapacitorCommunitySpeechRecognition.podspec

@@ -8,6 +8,6 @@
     s.author = 'Priyank Patel <[email protected]>'
     s.source = { :git => 'https://github.com/capacitor-community/speech-recognition', :tag => s.version.to_s }
     s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-    s.ios.deployment_target  = '11.0'
+    s.ios.deployment_target  = '12.0'
     s.dependency 'Capacitor'
   end

README.md

@@ -78,9 +78,7 @@ No configuration required for this plugin
 ## Usage
 
 ```typescript
-import { Plugins } from "@capacitor/core";
-
-const { SpeechRecognition } = Plugins;
+import { SpeechRecognition } from "@capacitor-community/speech-recognition";
 
 /**
  * This method will check if speech recognition feature is available on the device.

android/build.gradle

@@ -1,7 +1,8 @@
 ext {
-    junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.12'
-    androidxJunitVersion =  project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.1'
-    androidxEspressoCoreVersion =  project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.2.0'
+    junitVersion =  project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0'
+    androidxJunitVersion =  project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.2'
+    androidxEspressoCoreVersion =  project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.3.0'
 }
 
 buildscript {
@@ -10,20 +11,20 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 29
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 29
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
         versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionName '1.0'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -46,10 +47,10 @@ repositories {
     mavenCentral()
 }
 
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

android/src/main/java/com/getcapacitor/community/speechrecognition/Constants.java

@@ -3,17 +3,17 @@
 import android.Manifest;
 
 public interface Constants {
-    int REQUEST_CODE_PERMISSION = 2001;
-    int REQUEST_CODE_SPEECH = 2002;
-    String IS_RECOGNITION_AVAILABLE = "isRecognitionAvailable";
-    String START_LISTENING = "startListening";
-    String STOP_LISTENING = "stopListening";
-    String GET_SUPPORTED_LANGUAGES = "getSupportedLanguages";
-    String HAS_PERMISSION = "hasPermission";
-    String REQUEST_PERMISSION = "requestPermission";
-    int MAX_RESULTS = 5;
-    String NOT_AVAILABLE = "Speech recognition service is not available.";
-    String MISSING_PERMISSION = "Missing permission";
-    String RECORD_AUDIO_PERMISSION = Manifest.permission.RECORD_AUDIO;
-    String ERROR = "Could not get list of languages";
+  int REQUEST_CODE_PERMISSION = 2001;
+  int REQUEST_CODE_SPEECH = 2002;
+  String IS_RECOGNITION_AVAILABLE = "isRecognitionAvailable";
+  String START_LISTENING = "startListening";
+  String STOP_LISTENING = "stopListening";
+  String GET_SUPPORTED_LANGUAGES = "getSupportedLanguages";
+  String HAS_PERMISSION = "hasPermission";
+  String REQUEST_PERMISSION = "requestPermission";
+  int MAX_RESULTS = 5;
+  String NOT_AVAILABLE = "Speech recognition service is not available.";
+  String MISSING_PERMISSION = "Missing permission";
+  String RECORD_AUDIO_PERMISSION = Manifest.permission.RECORD_AUDIO;
+  String ERROR = "Could not get list of languages";
 }

android/src/main/java/com/getcapacitor/community/speechrecognition/Receiver.java

@@ -5,51 +5,49 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
-
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
-
 import java.util.List;
 
 public class Receiver extends BroadcastReceiver implements Constants {
+  public static final String TAG = "Receiver";
 
-    public static final String TAG = "Receiver";
+  private List<String> supportedLanguagesList;
+  private String languagePref;
+  private PluginCall call;
 
-    private List<String> supportedLanguagesList;
-    private String languagePref;
-    private PluginCall call;
+  public Receiver(PluginCall call) {
+    super();
+    this.call = call;
+  }
 
-    public Receiver(PluginCall call) {
-        super();
+  @Override
+  public void onReceive(Context context, Intent intent) {
+    Bundle extras = getResultExtras(true);
 
-        this.call = call;
+    if (extras.containsKey(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE)) {
+      languagePref =
+        extras.getString(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE);
     }
 
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        Bundle extras = getResultExtras(true);
-
-        if (extras.containsKey(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE)) {
-            languagePref = extras.getString(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE);
-        }
-
-        if (extras.containsKey(RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES)) {
-            supportedLanguagesList = extras.getStringArrayList(RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES);
+    if (extras.containsKey(RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES)) {
+      supportedLanguagesList =
+        extras.getStringArrayList(RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES);
 
-            JSArray languagesList = new JSArray(supportedLanguagesList);
-            call.success(new JSObject().put("languages", languagesList));
-            return;
-        }
-
-        call.error(ERROR);
+      JSArray languagesList = new JSArray(supportedLanguagesList);
+      call.resolve(new JSObject().put("languages", languagesList));
+      return;
     }
 
-    public List<String> getSupportedLanguages() {
-        return supportedLanguagesList;
-    }
+    call.reject(ERROR);
+  }
 
-    public String getLanguagePreference() {
-        return languagePref;
-    }
+  public List<String> getSupportedLanguages() {
+    return supportedLanguagesList;
+  }
+
+  public String getLanguagePreference() {
+    return languagePref;
+  }
 }

android/src/main/java/com/getcapacitor/community/speechrecognition/SpeechRecognition.java

@@ -11,10 +11,11 @@
 import androidx.annotation.Nullable;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
-import com.getcapacitor.NativePlugin;
 import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
+import com.getcapacitor.annotation.CapacitorPlugin;
+import com.getcapacitor.annotation.Permission;
 import com.orhanobut.logger.AndroidLogAdapter;
 import com.orhanobut.logger.BuildConfig;
 import com.orhanobut.logger.Logger;
@@ -24,9 +25,13 @@
 import java.util.concurrent.locks.ReentrantLock;
 import org.json.JSONArray;
 
-@NativePlugin(
-  permissions = { Manifest.permission.RECORD_AUDIO },
-  requestCodes = { SpeechRecognition.REQUEST_CODE_SPEECH }
+@CapacitorPlugin(
+  permissions = {
+    @Permission(
+      strings = { Manifest.permission.RECORD_AUDIO },
+      alias = "record_audio"
+    ),
+  }
 )
 public class SpeechRecognition extends Plugin implements Constants {
   public static final String TAG = "SpeechRecognition";
@@ -77,18 +82,18 @@ public void available(PluginCall call) {
     boolean val = isSpeechRecognitionAvailable();
     JSObject result = new JSObject();
     result.put("available", val);
-    call.success(result);
+    call.resolve(result);
   }
 
   @PluginMethod
   public void start(PluginCall call) {
     if (!isSpeechRecognitionAvailable()) {
-      call.error(NOT_AVAILABLE);
+      call.unavailable(NOT_AVAILABLE);
       return;
     }
 
     if (!hasAudioPermissions(RECORD_AUDIO_PERMISSION)) {
-      call.error(MISSING_PERMISSION);
+      call.reject(MISSING_PERMISSION);
       return;
     }
 
@@ -108,7 +113,7 @@ public void stop(final PluginCall call) {
     try {
       stopListening();
     } catch (Exception ex) {
-      call.error(ex.getLocalizedMessage());
+      call.reject(ex.getLocalizedMessage());
     }
   }
 
@@ -121,7 +126,7 @@ public void getSupportedLanguages(PluginCall call) {
     List<String> supportedLanguages = languageReceiver.getSupportedLanguages();
     if (supportedLanguages != null) {
       JSONArray languages = new JSONArray(supportedLanguages);
-      call.success(new JSObject().put("languages", languages));
+      call.resolve(new JSObject().put("languages", languages));
       return;
     }
 
@@ -146,7 +151,7 @@ public void getSupportedLanguages(PluginCall call) {
 
   @PluginMethod
   public void hasPermission(PluginCall call) {
-    call.success(
+    call.resolve(
       new JSObject()
       .put("permission", hasAudioPermissions(RECORD_AUDIO_PERMISSION))
     );
@@ -162,9 +167,9 @@ public void requestPermission(PluginCall call) {
             new String[] { RECORD_AUDIO_PERMISSION },
             REQUEST_CODE_PERMISSION
           );
-        call.success();
+        call.resolve();
       } else {
-        call.success();
+        call.resolve();
       }
     }
   }
@@ -190,12 +195,12 @@ protected void handleOnActivityResult(
           );
           JSObject result = new JSObject();
           result.put("matches", new JSArray(matchesList));
-          savedCall.success(result);
+          savedCall.resolve(result);
         } catch (Exception ex) {
-          savedCall.error(ex.getMessage());
+          savedCall.reject(ex.getMessage());
         }
       } else {
-        savedCall.error(Integer.toString(requestCode));
+        savedCall.reject(Integer.toString(requestCode));
       }
 
       SpeechRecognition.this.lock.lock();
@@ -273,7 +278,7 @@ private void beginListening(
               speechRecognizer.startListening(intent);
               SpeechRecognition.this.listening(true);
             } catch (Exception ex) {
-              call.error(ex.getMessage());
+              call.reject(ex.getMessage());
             } finally {
               SpeechRecognition.this.lock.unlock();
             }
@@ -330,7 +335,7 @@ public void onError(int error) {
       String errorMssg = getErrorText(error);
 
       if (this.call != null) {
-        call.error(errorMssg);
+        call.reject(errorMssg);
       }
     }
 
@@ -344,12 +349,12 @@ public void onResults(Bundle results) {
         JSArray jsArray = new JSArray(matches);
 
         if (this.call != null) {
-          this.call.success(
+          this.call.resolve(
               new JSObject().put("status", "success").put("matches", jsArray)
             );
         }
       } catch (Exception ex) {
-        this.call.success(
+        this.call.resolve(
             new JSObject()
               .put("status", "error")
               .put("message", ex.getMessage())

ios/Plugin.xcodeproj/project.pbxproj

@@ -375,7 +375,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -429,7 +429,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -452,7 +452,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
@@ -477,7 +477,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;