From 52c4142dcbaa35c310efdbbe3d9e9e60cbf3c4d4 Mon Sep 17 00:00:00 2001
From: Marco Trevisan <mail@3v1n0.net>
Date: Mon, 27 Nov 2023 13:45:47 +0100
Subject: [PATCH 1/3] snap: Use core20 as default base

core18 is quite old base nowadays and it's better to use a newer base to
have more updated desktop libraries around to have better toolkit
integration and wayland support.

People relying on older bases can always explicitly use core18 when
upgrading electron-builder.
---
 docs/configuration/snap.md                             | 2 +-
 packages/app-builder-lib/scheme.json                   | 4 ++--
 packages/app-builder-lib/src/options/SnapOptions.ts    | 2 +-
 packages/app-builder-lib/templates/snap/snapcraft.yaml | 2 +-
 test/src/linux/snapTest.ts                             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/configuration/snap.md b/docs/configuration/snap.md
index 131515f389f..a899e55f0cf 100644
--- a/docs/configuration/snap.md
+++ b/docs/configuration/snap.md
@@ -3,7 +3,7 @@ The top-level [snap](configuration.md#Configuration-snap) key contains set of op
 <!-- do not edit. start of generated block -->
 <ul>
 <li>
-<p><code id="SnapOptions-base">base</code> String | “undefined” - A snap of type base to be used as the execution environment for this snap. Examples: <code>core</code>, <code>core18</code>, <code>core20</code>, <code>core22</code>. Defaults to <code>core18</code></p>
+<p><code id="SnapOptions-base">base</code> String | “undefined” - A snap of type base to be used as the execution environment for this snap. Examples: <code>core</code>, <code>core18</code>, <code>core20</code>, <code>core22</code>. Defaults to <code>core20</code></p>
 </li>
 <li>
 <p><code id="SnapOptions-confinement">confinement</code> = <code>strict</code> “devmode” | “strict” | “classic” | “undefined” - The type of <a href="https://snapcraft.io/docs/reference/confinement">confinement</a> supported by the snap.</p>
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index 3955f313288..00d7537beff 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -5687,7 +5687,7 @@
           "type": "boolean"
         },
         "base": {
-          "description": "A snap of type base to be used as the execution environment for this snap. Examples: `core`, `core18`, `core20`, `core22`. Defaults to `core18`",
+          "description": "A snap of type base to be used as the execution environment for this snap. Examples: `core`, `core18`, `core20`, `core22`. Defaults to `core20`",
           "type": [
             "null",
             "string"
@@ -7714,4 +7714,4 @@
     }
   },
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/app-builder-lib/src/options/SnapOptions.ts b/packages/app-builder-lib/src/options/SnapOptions.ts
index 5938d32ac8e..764e312d774 100644
--- a/packages/app-builder-lib/src/options/SnapOptions.ts
+++ b/packages/app-builder-lib/src/options/SnapOptions.ts
@@ -3,7 +3,7 @@ import { CommonLinuxOptions } from "./linuxOptions"
 
 export interface SnapOptions extends CommonLinuxOptions, TargetSpecificOptions {
   /**
-   * A snap of type base to be used as the execution environment for this snap. Examples: `core`, `core18`, `core20`, `core22`. Defaults to `core18`
+   * A snap of type base to be used as the execution environment for this snap. Examples: `core`, `core18`, `core20`, `core22`. Defaults to `core20`
    */
   readonly base?: string | null
 
diff --git a/packages/app-builder-lib/templates/snap/snapcraft.yaml b/packages/app-builder-lib/templates/snap/snapcraft.yaml
index 08ed9604b8e..f0d706d3c0b 100644
--- a/packages/app-builder-lib/templates/snap/snapcraft.yaml
+++ b/packages/app-builder-lib/templates/snap/snapcraft.yaml
@@ -1,4 +1,4 @@
-base: core18
+base: core20
 grade: stable
 confinement: strict
 parts:
diff --git a/test/src/linux/snapTest.ts b/test/src/linux/snapTest.ts
index 8403c66371f..e8919824e2f 100644
--- a/test/src/linux/snapTest.ts
+++ b/test/src/linux/snapTest.ts
@@ -305,7 +305,7 @@ test.ifDevOrLinuxCi(
     },
     effectiveOptionComputed: async ({ snap }) => {
       expect(snap).toMatchSnapshot()
-      expect(snap.base).toBe("core18")
+      expect(snap.base).toBe("core20")
       return true
     },
   })

From 4cf154b0c1e3cdfd3bbf97660fabd19df303f7c2 Mon Sep 17 00:00:00 2001
From: Mike Maietta <mmaietta@users.noreply.github.com>
Date: Mon, 27 Nov 2023 07:16:06 -0800
Subject: [PATCH 2/3] Create great-teachers-camp.md

---
 .changeset/great-teachers-camp.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/great-teachers-camp.md

diff --git a/.changeset/great-teachers-camp.md b/.changeset/great-teachers-camp.md
new file mode 100644
index 00000000000..fc854afe2d5
--- /dev/null
+++ b/.changeset/great-teachers-camp.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": minor
+---
+
+feat(snap): Use core20 as default base

From 3a865b6ae0f61307475679ce0f4f0146ab815349 Mon Sep 17 00:00:00 2001
From: Mike Maietta <mmaietta@outlook.com>
Date: Tue, 12 Dec 2023 10:45:02 -0800
Subject: [PATCH 3/3] regenerate schema, prettier, and update snapshot

---
 packages/app-builder-lib/scheme.json        |  2 +-
 packages/app-builder-lib/src/macPackager.ts |  2 +-
 test/snapshots/linux/snapTest.js.snap       | 34 ++++++++++-----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
index 00d7537beff..08650aec2e2 100644
--- a/packages/app-builder-lib/scheme.json
+++ b/packages/app-builder-lib/scheme.json
@@ -7714,4 +7714,4 @@
     }
   },
   "type": "object"
-}
+}
\ No newline at end of file
diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts
index c2779059452..525f57661d0 100644
--- a/packages/app-builder-lib/src/macPackager.ts
+++ b/packages/app-builder-lib/src/macPackager.ts
@@ -562,7 +562,7 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
     }
     if (notaryToolLogin) {
       return {
-        tool: 'notarytool',
+        tool: "notarytool",
         appPath,
         ...notaryToolLogin,
       }
diff --git a/test/snapshots/linux/snapTest.js.snap b/test/snapshots/linux/snapTest.js.snap
index 0987fb04a59..bce199a4b73 100644
--- a/test/snapshots/linux/snapTest.js.snap
+++ b/test/snapshots/linux/snapTest.js.snap
@@ -42,7 +42,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -181,7 +181,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -404,7 +404,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "compression": "xz",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
@@ -611,7 +611,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -681,7 +681,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -750,7 +750,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -819,7 +819,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -869,7 +869,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1034,7 +1034,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1200,7 +1200,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1366,7 +1366,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "classic",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1542,7 +1542,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1602,7 +1602,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -1803,7 +1803,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -2017,7 +2017,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -2090,7 +2090,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",
@@ -2176,7 +2176,7 @@ Object {
   "architectures": Array [
     "amd64",
   ],
-  "base": "core18",
+  "base": "core20",
   "confinement": "strict",
   "description": "Test Application (test quite “ #378)",
   "grade": "stable",