Reverted app_bundle change and fixed environment variables

.goreleaser.yml

@@ -2,7 +2,6 @@
 version: 2
 
 project_name: tart
-version: 2
 
 before:
   hooks:
@@ -24,33 +23,33 @@ builds:
       path: '.build/{{- if eq .Arch "arm64" }}arm64{{- else }}x86_64{{ end }}-apple-macosx/release/tart'
 
 universal_binaries:
-  - replace: true
+  - name_template: tart.app/Contents/MacOS/tart
+    replace: true
 
 notarize:
   macos:
-    - enabled: '{{ isEnvSet "MACOS_SIGN_P12" }}'
+    - enabled: '{{ isEnvSet "MACOS_CERTIFICATE" }}'
       sign:
-        certificate: "{{.Env.MACOS_SIGN_P12}}"
-        password: "{{.Env.MACOS_SIGN_PASSWORD}}"
-        entitlements: ./Resources/tart-{{ if or .IsSnapshot .IsNightly }}dev{{ else }}prod{{ end }}.entitlements
+        certificate: "{{.Env.MACOS_CERTIFICATE}}"
+        password: "password101"
+        entitlements: ./Resources/tart-prod.entitlements
       notarize:
-        issuer_id: "{{.Env.MACOS_NOTARY_ISSUER_ID}}"
-        key_id: "{{.Env.MACOS_NOTARY_KEY_ID}}"
-        key: "{{.Env.MACOS_NOTARY_KEY}}"
-
-app_bundles:
-  - name: tart
-    extra_files:
-      - src: ./Resources/Info.plist
-        dst: Contents/Info.plist
-      - src: ./Resources/embedded.provisionprofile
-        dst: Contents/embedded.provisionprofile
-      - src: ./Resources/AppIcon.png
-        dst: Contents/Resources/AppIcon.png
+        issuer_id: "9M2P8L4D89"
+        key_id: "hello@cirruslabs.org"
+        key: "{{.Env.AC_PASSWORD}}"
 
 archives:
   - name_template: "{{ .ProjectName }}"
     files:
+      - src: Resources/embedded.provisionprofile
+        dst: tart.app/Contents
+        strip_parent: true
+      - src: Resources/Info.plist
+        dst: tart.app/Contents
+        strip_parent: true
+      - src: Resources/AppIcon.png
+        dst: tart.app/Contents/Resources
+        strip_parent: true
       - LICENSE
 
 release:

gon.hcl

@@ -1,12 +0,0 @@
-source = [ "dist/tart_darwin_all/tart.app/Contents/MacOS/tart" ]
-bundle_id = "com.github.cirruslabs.tart"
-
-apple_id {
-  username = "hello@cirruslabs.org"
-  password = "@env:AC_PASSWORD"
-}
-
-sign {
-  application_identity = "Developer ID Application: Cirrus Labs, Inc."
-  entitlements_file = "Resources/tart-prod.entitlements"
-}