fix: Remove adapter if core22+ is set as base on snapcraft (#7378)

filfreire · web-flow · commit db69a1875d21 · 2023-01-22T16:38:17.000-08:00
diff --git a/.changeset/thin-terms-change.md b/.changeset/thin-terms-change.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": major
+---
+
+Remove extra adapter field if core22 is set as base for snapcraft
diff --git a/packages/app-builder-lib/src/targets/snap.ts b/packages/app-builder-lib/src/targets/snap.ts
@@ -71,6 +71,10 @@ export default class SnapTarget extends Target {
     }
     if (options.base != null) {
       snap.base = options.base
+      // from core22 onwards adapter is legacy
+      if (Number(snap.base.split("core")[1]) >= 22) {
+        delete appDescriptor.adapter
+      }
     }
     if (options.grade != null) {
       snap.grade = options.grade

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ export default class SnapTarget extends Target {`
`71`	`71`	`}`
`72`	`72`	`if (options.base != null) {`
`73`	`73`	`snap.base = options.base`
	`74`	`+ // from core22 onwards adapter is legacy`
	`75`	`+ if (Number(snap.base.split("core")[1]) >= 22) {`
	`76`	`+ delete appDescriptor.adapter`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`	`if (options.grade != null) {`
`76`	`80`	`snap.grade = options.grade`