Merge branch 'main' into local-notifications/alarm-permissions

.github/workflows/ci.yml

@@ -50,11 +50,39 @@ jobs:
         with:
          files: ${{ steps.catjson.outputs.FILES_JSON }}
 
+  lint-scripts:
+    runs-on: macos-13
+    timeout-minutes: 30
+    needs:
+      - setup
+    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+      - name: NPM ^9.5.0
+        run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
+      - uses: actions/checkout@v3
+      - name: Restore Dependency Cache
+        id: cache-modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            */node_modules
+          key: ${{ runner.os }}-dependency-caching-${{ hashFiles('package.json', '*/package.json') }}
+      - run: npm install
+      - run: npm run lint
+
   lint:
     runs-on: macos-13
     timeout-minutes: 30
     needs:
       - setup
+      - lint-scripts
+    if: needs.setup.outputs.plugins != '[]'
+    strategy:
+      matrix:
+        plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -72,6 +100,7 @@ jobs:
           key: ${{ runner.os }}-dependency-caching-${{ hashFiles('package.json', '*/package.json') }}
       - run: npm install
       - run: npm run lint
+        working-directory: ${{ matrix.plugin }}
 
   verify-ios:
     runs-on: macos-13
@@ -80,6 +109,7 @@ jobs:
     needs:
       - setup
       - lint
+      - lint-scripts
     strategy:
       matrix:
         xcode:
@@ -102,7 +132,6 @@ jobs:
             */node_modules
           key: ${{ runner.os }}-dependency-caching-${{ hashFiles('package.json', '*/package.json') }}
       - run: npm install
-      - run: npm run set-podfiles-for-monorepo
       - run: npm run verify:ios
         working-directory: ${{ matrix.plugin }}
 
@@ -113,6 +142,7 @@ jobs:
     needs:
       - setup
       - lint
+      - lint-scripts
     strategy:
       matrix:
         plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
@@ -148,6 +178,7 @@ jobs:
     needs:
       - setup
       - lint
+      - lint-scripts
     strategy:
       matrix:
         plugin: ${{ fromJson(needs.setup.outputs.plugins) }}

.github/workflows/dev-releases-for-pr.yml

@@ -71,9 +71,11 @@ jobs:
       - run: npm install
       - env: 
           PR_NUMBER: ${{ github.event.pull_request.number }}
+          GH_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: | 
           npm version prerelease --no-git-tag-version -f --preid dev-$PR_NUMBER-$(date +%Y%m%dT%H%M%S)
-          npm publish --tag dev --dry-run
+          npm publish --tag dev
         working-directory: ${{ matrix.plugin }}
       - name: get-npm-version
         id: package-version

README.md

@@ -2,12 +2,13 @@
 
 This repository contains the official Capacitor plugins maintained by the Capacitor team. You can find more plugins in the [Capacitor Community](https://github.com/capacitor-community/).
 
-> ### :rotating_light: These plugins are for Capacitor 5 :rotating_light:
+> ### :rotating_light: These plugins are for Capacitor 6 :rotating_light:
 >
 > Capacitor 2 core plugins are bundled with Capacitor itself.
 >
 > For Capacitor 3, use the 1.x version of the plugins.
 > For Capacitor 4, use the 4.x version of the plugins.
+> For Capacitor 5, use the 5.x version of the plugins.
 
 ## Plugins
 

action-sheet/README.md

@@ -13,7 +13,7 @@ npx cap sync
 
 This plugin will use the following project variables (defined in your app's `variables.gradle` file):
 
-- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.9.0`)
+- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.10.0`)
 
 ## PWA Notes
 

action-sheet/android/build.gradle

@@ -2,7 +2,7 @@ ext {
     capacitorVersion = System.getenv('CAPACITOR_VERSION')
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
     androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.9.0'
+    androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.10.0'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 }

action-sheet/ios/Podfile

@@ -3,8 +3,8 @@ platform :ios, '13.0'
 def capacitor_pods
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
   use_frameworks!
-  pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
+  pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
 end
 
 target 'Plugin' do

action-sheet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/action-sheet",
-  "version": "5.0.6",
+  "version": "6.0.0-alpha.1",
   "description": "The Action Sheet API provides access to native Action Sheets, which come up from the bottom of the screen and display actions a user can take.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -45,10 +45,10 @@
     "publish:cocoapod": "pod trunk push ./CapacitorActionSheet.podspec --allow-warnings"
   },
   "devDependencies": {
-    "@capacitor/android": "^5.0.0",
-    "@capacitor/core": "^5.0.0",
+    "@capacitor/android": "next",
+    "@capacitor/core": "next",
     "@capacitor/docgen": "0.2.0",
-    "@capacitor/ios": "^5.0.0",
+    "@capacitor/ios": "next",
     "@ionic/eslint-config": "^0.3.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
@@ -61,7 +61,7 @@
     "typescript": "~4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^5.0.0"
+    "@capacitor/core": "next"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",