chore: merge main, resolve conflicts

Author: WillieRuemmele

.idea/vcs.xml

@@ -1,3 +1,9 @@
+## [2.3.2](https://github.com/salesforcecli/plugin-apex/compare/2.3.1...2.3.2) (2023-06-05)
+
+### Bug Fixes
+
+- **deps:** update library, new snapshot ([b374bfd](https://github.com/salesforcecli/plugin-apex/commit/b374bfd05216e31818a9c0f447adc5a2373ee9cc))
+
 ## [2.3.1](https://github.com/salesforcecli/plugin-apex/compare/2.3.0...2.3.1) (2023-06-05)
 
 ### Bug Fixes

CHANGELOG.md

@@ -1,14 +1,14 @@
 {
   "name": "@salesforce/plugin-apex",
   "description": "Apex commands",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "main": "lib/index.js",
   "dependencies": {
-    "@oclif/core": "^2.8.2",
+    "@oclif/core": "^2.8.5",
     "@salesforce/apex-node": "^1.6.2",
-    "@salesforce/core": "^4.0.1",
+    "@salesforce/core": "^4.1.0",
     "@salesforce/sf-plugins-core": "^3.0.2",
     "chalk": "^4.1.0",
     "tslib": "^2"
@@ -20,7 +20,6 @@
     "@salesforce/dev-config": "^4.0.1",
     "@salesforce/dev-scripts": "^5.4.2",
     "@salesforce/plugin-command-reference": "^3.0.2",
-    "@salesforce/plugin-deploy-retrieve": "^1.11.0",
     "@salesforce/prettier-config": "^0.0.3",
     "@salesforce/ts-sinon": "^1.4.8",
     "@salesforce/ts-types": "^2.0.3",