feat!: update to Capacitor 7

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ on:
 
 env:
   NODE_VERSION: 18
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
 
 jobs:
   build:

CapacitorCommunitySpeechRecognition.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   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.ios.deployment_target  = '13.0'
+  s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

android/build.gradle

@@ -1,8 +1,8 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
 }
 
 buildscript {
@@ -11,18 +11,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     namespace "com.getcapacitor.community.speechrecognition.speechrecognition"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -37,8 +37,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +148,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

android/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

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

@@ -47,14 +47,12 @@ public void load() {
         super.load();
         bridge
             .getWebView()
-            .post(
-                () -> {
-                    speechRecognizer = SpeechRecognizer.createSpeechRecognizer(bridge.getActivity());
-                    SpeechRecognitionListener listener = new SpeechRecognitionListener();
-                    speechRecognizer.setRecognitionListener(listener);
-                    Logger.info(getLogTag(), "Instantiated SpeechRecognizer in load()");
-                }
-            );
+            .post(() -> {
+                speechRecognizer = SpeechRecognizer.createSpeechRecognizer(bridge.getActivity());
+                SpeechRecognitionListener listener = new SpeechRecognitionListener();
+                speechRecognizer.setRecognitionListener(listener);
+                Logger.info(getLogTag(), "Instantiated SpeechRecognizer in load()");
+            });
     }
 
     @PluginMethod
@@ -180,55 +178,51 @@ private void beginListening(
         } else {
             bridge
                 .getWebView()
-                .post(
-                    () -> {
-                        try {
-                            SpeechRecognition.this.lock.lock();
-
-                            if (speechRecognizer != null) {
-                                speechRecognizer.cancel();
-                                speechRecognizer.destroy();
-                                speechRecognizer = null;
-                            }
-
-                            speechRecognizer = SpeechRecognizer.createSpeechRecognizer(bridge.getActivity());
-                            SpeechRecognitionListener listener = new SpeechRecognitionListener();
-                            listener.setCall(call);
-                            listener.setPartialResults(partialResults);
-                            speechRecognizer.setRecognitionListener(listener);
-                            speechRecognizer.startListening(intent);
-                            SpeechRecognition.this.listening(true);
-                            if (partialResults) {
-                                call.resolve();
-                            }
-                        } catch (Exception ex) {
-                            call.reject(ex.getMessage());
-                        } finally {
-                            SpeechRecognition.this.lock.unlock();
+                .post(() -> {
+                    try {
+                        SpeechRecognition.this.lock.lock();
+
+                        if (speechRecognizer != null) {
+                            speechRecognizer.cancel();
+                            speechRecognizer.destroy();
+                            speechRecognizer = null;
+                        }
+
+                        speechRecognizer = SpeechRecognizer.createSpeechRecognizer(bridge.getActivity());
+                        SpeechRecognitionListener listener = new SpeechRecognitionListener();
+                        listener.setCall(call);
+                        listener.setPartialResults(partialResults);
+                        speechRecognizer.setRecognitionListener(listener);
+                        speechRecognizer.startListening(intent);
+                        SpeechRecognition.this.listening(true);
+                        if (partialResults) {
+                            call.resolve();
                         }
+                    } catch (Exception ex) {
+                        call.reject(ex.getMessage());
+                    } finally {
+                        SpeechRecognition.this.lock.unlock();
                     }
-                );
+                });
         }
     }
 
     private void stopListening() {
         bridge
             .getWebView()
-            .post(
-                () -> {
-                    try {
-                        SpeechRecognition.this.lock.lock();
-                        if (SpeechRecognition.this.listening) {
-                            speechRecognizer.stopListening();
-                            SpeechRecognition.this.listening(false);
-                        }
-                    } catch (Exception ex) {
-                        throw ex;
-                    } finally {
-                        SpeechRecognition.this.lock.unlock();
+            .post(() -> {
+                try {
+                    SpeechRecognition.this.lock.lock();
+                    if (SpeechRecognition.this.listening) {
+                        speechRecognizer.stopListening();
+                        SpeechRecognition.this.listening(false);
                     }
+                } catch (Exception ex) {
+                    throw ex;
+                } finally {
+                    SpeechRecognition.this.lock.unlock();
                 }
-            );
+            });
     }
 
     private class SpeechRecognitionListener implements RecognitionListener {
@@ -270,20 +264,18 @@ public void onBufferReceived(byte[] buffer) {}
         public void onEndOfSpeech() {
             bridge
                 .getWebView()
-                .post(
-                    () -> {
-                        try {
-                            SpeechRecognition.this.lock.lock();
-                            SpeechRecognition.this.listening(false);
-
-                            JSObject ret = new JSObject();
-                            ret.put("status", "stopped");
-                            SpeechRecognition.this.notifyListeners(LISTENING_EVENT, ret);
-                        } finally {
-                            SpeechRecognition.this.lock.unlock();
-                        }
+                .post(() -> {
+                    try {
+                        SpeechRecognition.this.lock.lock();
+                        SpeechRecognition.this.listening(false);
+
+                        JSObject ret = new JSObject();
+                        ret.put("status", "stopped");
+                        SpeechRecognition.this.notifyListeners(LISTENING_EVENT, ret);
+                    } finally {
+                        SpeechRecognition.this.lock.unlock();
                     }
-                );
+                });
         }
 
         @Override

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 = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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 = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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 = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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;
@@ -478,7 +478,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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;

ios/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '13.0'
+platform :ios, '14.0'
 
 def capacitor_pods
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks