Merge branch 'main' into runtime-refactor

Conflicts: action-sheet/package.json app-launcher/package.json app/package.json browser/package.json clipboard/package.json device/package.json device/src/web.ts dialog/package.json haptics/package.json keyboard/package.json motion/package.json motion/src/index.ts network/package.json screen-reader/package.json share/package.json status-bar/package.json storage/package.json text-zoom/package.json toast/package.json
ionic-team · Nov 24, 2020 · 6455cc8 · 6455cc8
2 parents aef06d8 + b681b7d
commit 6455cc8
Show file tree

Hide file tree

Showing 116 changed files with 250 additions and 361 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,6 @@ jobs:
     runs-on: macos-latest
     timeout-minutes: 30
     steps:
-      - run: brew install swiftlint
       - uses: actions/setup-node@v1
         with:
           node-version: 14.x

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -54,6 +54,21 @@ This script is for setting the version (or version range) of Capacitor packages
 
 This script is for switching between Capacitor packages from npm and Capacitor packages installed locally. It will also run `lerna bootstrap` for you.
 
+> If you get npm errors, you can try installing from scratch:
+>
+> 1. Reset the changes in `package.json` files.
+> 1. Clear out all `node_modules`.
+>
+>     ```shell
+>     npx lerna exec 'rm -fr package-lock.json && rm -fr node_modules'
+>     rm -fr node_modules
+>     ```
+> 1. Install with local dependencies:
+>
+>     ```
+>     npm run toggle-local
+>     ```
+
 #### `npm run apply-patches "<package>"`
 
 This script is for copying git changes from one plugin to all plugins.

diff --git a/action-sheet/android/build.gradle b/action-sheet/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 

diff --git a/action-sheet/android/gradle/wrapper/gradle-wrapper.jar b/action-sheet/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/action-sheet/android/gradle/wrapper/gradle-wrapper.properties b/action-sheet/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/action-sheet/android/gradlew b/action-sheet/android/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/action-sheet/android/gradlew.bat b/action-sheet/android/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/action-sheet/android/src/main/res/layout/bridge_layout_main.xml b/action-sheet/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/action-sheet/package.json b/action-sheet/package.json
@@ -6,9 +6,10 @@
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
   "files": [
-    "android/",
+    "android/src/main/",
+    "android/build.gradle",
     "dist/",
-    "ios/",
+    "ios/Plugin/",
     "CapacitorActionSheet.podspec"
   ],
   "author": "Ionic <hi@ionicframework.com>",
@@ -47,11 +48,11 @@
     "@capacitor/docgen": "^0.0.10",
     "@capacitor/ios": "^3.0.0-alpha.6",
     "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^1.0.1",
+    "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
     "eslint": "^7.11.0",
-    "prettier": "^2.0.5",
-    "prettier-plugin-java": "^0.8.3",
+    "prettier": "~2.2.0",
+    "prettier-plugin-java": "~1.0.0",
     "rimraf": "^3.0.0",
     "rollup": "^2.29.0",
     "swiftlint": "^1.0.1",

diff --git a/app-launcher/android/build.gradle b/app-launcher/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 

diff --git a/app-launcher/android/gradle/wrapper/gradle-wrapper.jar b/app-launcher/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/app-launcher/android/gradle/wrapper/gradle-wrapper.properties b/app-launcher/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/app-launcher/android/gradlew b/app-launcher/android/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/app-launcher/android/gradlew.bat b/app-launcher/android/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/app-launcher/android/src/main/res/layout/bridge_layout_main.xml b/app-launcher/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/app-launcher/package.json b/app-launcher/package.json
@@ -6,9 +6,10 @@
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
   "files": [
-    "android/",
+    "android/src/main/",
+    "android/build.gradle",
     "dist/",
-    "ios/",
+    "ios/Plugin",
     "CapacitorAppLauncher.podspec"
   ],
   "author": "Ionic <hi@ionicframework.com>",
@@ -47,11 +48,11 @@
     "@capacitor/docgen": "^0.0.10",
     "@capacitor/ios": "^3.0.0-alpha.6",
     "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^1.0.1",
+    "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
     "eslint": "^7.11.0",
-    "prettier": "^2.1.2",
-    "prettier-plugin-java": "^0.8.3",
+    "prettier": "~2.2.0",
+    "prettier-plugin-java": "~1.0.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "swiftlint": "^1.0.1",

diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 

diff --git a/app/android/gradle/wrapper/gradle-wrapper.jar b/app/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/app/android/gradlew b/app/android/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/app/android/gradlew.bat b/app/android/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/app/android/src/main/res/layout/bridge_layout_main.xml b/app/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/app/package.json b/app/package.json
@@ -6,9 +6,10 @@
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
   "files": [
-    "android/",
+    "android/src/main/",
+    "android/build.gradle",
     "dist/",
-    "ios/",
+    "ios/Plugin/",
     "CapacitorApp.podspec"
   ],
   "author": "Ionic <hi@ionicframework.com>",
@@ -47,11 +48,11 @@
     "@capacitor/docgen": "^0.0.10",
     "@capacitor/ios": "^3.0.0-alpha.6",
     "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^1.0.1",
+    "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
     "eslint": "^7.11.0",
-    "prettier": "^2.0.5",
-    "prettier-plugin-java": "^0.8.3",
+    "prettier": "~2.2.0",
+    "prettier-plugin-java": "~1.0.0",
     "rimraf": "^3.0.0",
     "rollup": "^2.29.0",
     "swiftlint": "^1.0.1",

diff --git a/browser/android/build.gradle b/browser/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 

diff --git a/browser/android/gradle/wrapper/gradle-wrapper.jar b/browser/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/browser/android/gradle/wrapper/gradle-wrapper.properties b/browser/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/browser/android/gradlew b/browser/android/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/browser/android/gradlew.bat b/browser/android/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

diff --git a/browser/android/src/main/res/layout/bridge_layout_main.xml b/browser/android/src/main/res/layout/bridge_layout_main.xml