Merge branch 'main' into RMET-4558

Author: eric-horodyski

.github/actions/changed-packages/action.yml

@@ -8,5 +8,5 @@ outputs:
   paths:
     description: An array of relative paths to packages that were changed
 runs:
-  using: node12
+  using: node20
   main: main.js

.github/actions/changed-packages/main.js

@@ -1,18 +1,19 @@
-require = require('esm')(module);
-
 const { relative, resolve } = require('path');
-const core = require('@actions/core')
+const core = require('@actions/core');
+
+(async () => {
+    const { root } = await import('../../../scripts/lib/repo.mjs');
+    const { execute } = await import('../../../scripts/lib/cli.mjs');
+    const { ls } = await import('../../../scripts/lib/lerna.mjs');
 
-const { root } = require('../../../scripts/lib/repo.mjs');
-const { execute } = require('../../../scripts/lib/cli.mjs');
-const { ls } = require('../../../scripts/lib/lerna.mjs');
+    execute(async () => {
+        const files = JSON.parse(core.getInput('files', '[]')).map(f => resolve(root, f));
+        const packages = await ls();
+        const changedPackages = packages.filter(pkg => files.some(f => f.startsWith(pkg.location)));
+        const paths = JSON.stringify(changedPackages.map(pkg => relative(root, pkg.location)));
 
-execute(async () => {
-  const files = JSON.parse(core.getInput('files', '[]')).map(f => resolve(root, f));
-  const packages = await ls();
-  const changedPackages = packages.filter(pkg => files.some(f => f.startsWith(pkg.location)));
-  const paths = JSON.stringify(changedPackages.map(pkg => relative(root, pkg.location)));
+        core.info(`Changed package paths: ${paths}`);
+        core.setOutput('paths', paths);
+    });
+})();
 
-  core.info(`Changed package paths: ${paths}`);
-  core.setOutput('paths', paths);
-});

action-sheet/.prettierignore

@@ -101,15 +101,13 @@ public void setupDialog(Dialog dialog, int style) {
             tv.setTextColor(Color.parseColor("#000000"));
             tv.setPadding(layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12, layoutPaddingPx12);
             tv.setText(options[i].getTitle());
-            tv.setOnClickListener(
-                view -> {
-                    Logger.debug("CliCKED: " + optionIndex);
+            tv.setOnClickListener((view) -> {
+                Logger.debug("CliCKED: " + optionIndex);
 
-                    if (listener != null) {
-                        listener.onSelect(optionIndex);
-                    }
+                if (listener != null) {
+                    listener.onSelect(optionIndex);
                 }
-            );
+            });
             layout.addView(tv);
         }
 

action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheet.java

@@ -40,14 +40,12 @@ public void showActions(final PluginCall call) {
             implementation.setTitle(title);
             implementation.setOptions(actionOptions);
             implementation.setCancelable(false);
-            implementation.setOnSelectedListener(
-                index -> {
-                    JSObject ret = new JSObject();
-                    ret.put("index", index);
-                    call.resolve(ret);
-                    implementation.dismiss();
-                }
-            );
+            implementation.setOnSelectedListener((index) -> {
+                JSObject ret = new JSObject();
+                ret.put("index", index);
+                call.resolve(ret);
+                implementation.dismiss();
+            });
             implementation.show(getActivity().getSupportFragmentManager(), "capacitorModalsActionSheet");
         } catch (JSONException ex) {
             Logger.error("JSON error processing an option for showActions", ex);

action-sheet/android/src/main/java/com/capacitorjs/plugins/actionsheet/ActionSheetPlugin.java

@@ -29,7 +29,7 @@ public class ActionSheetPlugin: CAPPlugin, CAPBridgedPlugin {
             } else if style == "CANCEL" {
                 buttonStyle = .cancel
             }
-            let action = UIAlertAction(title: title, style: buttonStyle, handler: { (_) -> Void in
+            let action = UIAlertAction(title: title, style: buttonStyle, handler: { (_) in
                 call.resolve([
                     "index": index
                 ])

action-sheet/ios/Sources/ActionSheetPlugin/ActionSheetPlugin.swift

@@ -37,7 +37,7 @@
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint . --ext ts",
-    "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api ActionSheetPlugin --output-readme README.md --output-json dist/docs.json",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
@@ -52,11 +52,11 @@
     "@capacitor/docgen": "0.2.2",
     "@capacitor/ios": "next",
     "@ionic/eslint-config": "^0.4.0",
-    "@ionic/prettier-config": "~1.0.1",
+    "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
     "eslint": "^8.57.0",
-    "prettier": "~2.3.0",
-    "prettier-plugin-java": "~1.0.2",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
     "rimraf": "^6.0.1",
     "rollup": "^4.26.0",
     "swiftlint": "^1.0.1",

action-sheet/package.json

@@ -3,7 +3,7 @@ import { registerPlugin } from '@capacitor/core';
 import type { ActionSheetPlugin } from './definitions';
 
 const ActionSheet = registerPlugin<ActionSheetPlugin>('ActionSheet', {
-  web: () => import('./web').then(m => new m.ActionSheetWeb()),
+  web: () => import('./web').then((m) => new m.ActionSheetWeb()),
 });
 
 export * from './definitions';

action-sheet/src/index.ts

@@ -1,10 +1,6 @@
 import { WebPlugin } from '@capacitor/core';
 
-import type {
-  ActionSheetPlugin,
-  ShowActionsResult,
-  ShowActionsOptions,
-} from './definitions';
+import type { ActionSheetPlugin, ShowActionsResult, ShowActionsOptions } from './definitions';
 
 export class ActionSheetWeb extends WebPlugin implements ActionSheetPlugin {
   async showActions(options: ShowActionsOptions): Promise<ShowActionsResult> {