From 00feccbb77ee0e09c62bfe76d7a66bc20a30d7eb Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 8 Sep 2023 11:23:38 +1000 Subject: [PATCH] Add MACOSX_DEPLOYMENT_TARGET to taskfiles --- v3/examples/build/Taskfile.yml | 3 +++ v3/examples/dev/Taskfile.yml | 3 +++ v3/examples/dialogs/Taskfile.yml | 1 + v3/examples/plugins/Taskfile.yml | 1 + v3/internal/templates/_base/default/Taskfile.tmpl.yml | 3 +++ v3/internal/templates/lit-ts/Taskfile.tmpl.yml | 5 ++++- v3/internal/templates/lit/Taskfile.tmpl.yml | 8 +++++--- v3/internal/templates/preact-ts/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/preact/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/react-swc-ts/Taskfile.tmpl.yml | 5 ++++- v3/internal/templates/react-swc/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/react-ts/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/react/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/svelte-ts/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/svelte/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/vanilla-ts/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/vanilla/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/vue-ts/Taskfile.tmpl.yml | 2 ++ v3/internal/templates/vue/Taskfile.tmpl.yml | 2 ++ 19 files changed, 46 insertions(+), 5 deletions(-) diff --git a/v3/examples/build/Taskfile.yml b/v3/examples/build/Taskfile.yml index d0d815f12..464464458 100644 --- a/v3/examples/build/Taskfile.yml +++ b/v3/examples/build/Taskfile.yml @@ -47,6 +47,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:backend:darwin: summary: Builds the application @@ -59,6 +60,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -109,6 +111,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/examples/dev/Taskfile.yml b/v3/examples/dev/Taskfile.yml index d0d815f12..464464458 100644 --- a/v3/examples/dev/Taskfile.yml +++ b/v3/examples/dev/Taskfile.yml @@ -47,6 +47,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:backend:darwin: summary: Builds the application @@ -59,6 +60,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -109,6 +111,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/examples/dialogs/Taskfile.yml b/v3/examples/dialogs/Taskfile.yml index 6b72ed65c..4d8555bc5 100644 --- a/v3/examples/dialogs/Taskfile.yml +++ b/v3/examples/dialogs/Taskfile.yml @@ -19,6 +19,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows diff --git a/v3/examples/plugins/Taskfile.yml b/v3/examples/plugins/Taskfile.yml index 3c88c18c3..01d8f2efc 100644 --- a/v3/examples/plugins/Taskfile.yml +++ b/v3/examples/plugins/Taskfile.yml @@ -17,6 +17,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" generate-icons: summary: Generates Windows `.ico` and Mac `.icns` files from an image diff --git a/v3/internal/templates/_base/default/Taskfile.tmpl.yml b/v3/internal/templates/_base/default/Taskfile.tmpl.yml index 6c409fdbd..7926f0d54 100644 --- a/v3/internal/templates/_base/default/Taskfile.tmpl.yml +++ b/v3/internal/templates/_base/default/Taskfile.tmpl.yml @@ -47,6 +47,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:backend:darwin: summary: Builds the application @@ -59,6 +60,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -109,6 +111,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/lit-ts/Taskfile.tmpl.yml b/v3/internal/templates/lit-ts/Taskfile.tmpl.yml index 6fe474737..975af7335 100644 --- a/v3/internal/templates/lit-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/lit-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -52,7 +53,8 @@ tasks: - windows cmds: - task: pre-build -- task: build-frontend - go build -gcflags=all="-N -l" -o bin/testapp.exe + - task: build-frontend + - go build -gcflags=all="-N -l" -o bin/testapp.exe - task: post-build build: @@ -78,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/lit/Taskfile.tmpl.yml b/v3/internal/templates/lit/Taskfile.tmpl.yml index af4686530..0be9948e1 100644 --- a/v3/internal/templates/lit/Taskfile.tmpl.yml +++ b/v3/internal/templates/lit/Taskfile.tmpl.yml @@ -39,12 +39,13 @@ tasks: - darwin cmds: - task: pre-build - - task: build-frontend - - go build -gcflags=all="-N -l" -o bin/testapp - - task: post-build + - task: build-frontend + - go build -gcflags=all="-N -l" -o bin/testapp + - task: post-build env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/preact-ts/Taskfile.tmpl.yml b/v3/internal/templates/preact-ts/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/preact-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/preact-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/preact/Taskfile.tmpl.yml b/v3/internal/templates/preact/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/preact/Taskfile.tmpl.yml +++ b/v3/internal/templates/preact/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/react-swc-ts/Taskfile.tmpl.yml b/v3/internal/templates/react-swc-ts/Taskfile.tmpl.yml index 6fe474737..975af7335 100644 --- a/v3/internal/templates/react-swc-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/react-swc-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -52,7 +53,8 @@ tasks: - windows cmds: - task: pre-build -- task: build-frontend - go build -gcflags=all="-N -l" -o bin/testapp.exe + - task: build-frontend + - go build -gcflags=all="-N -l" -o bin/testapp.exe - task: post-build build: @@ -78,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/react-swc/Taskfile.tmpl.yml b/v3/internal/templates/react-swc/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/react-swc/Taskfile.tmpl.yml +++ b/v3/internal/templates/react-swc/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/react-ts/Taskfile.tmpl.yml b/v3/internal/templates/react-ts/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/react-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/react-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/react/Taskfile.tmpl.yml b/v3/internal/templates/react/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/react/Taskfile.tmpl.yml +++ b/v3/internal/templates/react/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/svelte-ts/Taskfile.tmpl.yml b/v3/internal/templates/svelte-ts/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/svelte-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/svelte-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/svelte/Taskfile.tmpl.yml b/v3/internal/templates/svelte/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/svelte/Taskfile.tmpl.yml +++ b/v3/internal/templates/svelte/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/vanilla-ts/Taskfile.tmpl.yml b/v3/internal/templates/vanilla-ts/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/vanilla-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/vanilla-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/vanilla/Taskfile.tmpl.yml b/v3/internal/templates/vanilla/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/vanilla/Taskfile.tmpl.yml +++ b/v3/internal/templates/vanilla/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/vue-ts/Taskfile.tmpl.yml b/v3/internal/templates/vue-ts/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/vue-ts/Taskfile.tmpl.yml +++ b/v3/internal/templates/vue-ts/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH diff --git a/v3/internal/templates/vue/Taskfile.tmpl.yml b/v3/internal/templates/vue/Taskfile.tmpl.yml index 68631d952..f9646a735 100644 --- a/v3/internal/templates/vue/Taskfile.tmpl.yml +++ b/v3/internal/templates/vue/Taskfile.tmpl.yml @@ -45,6 +45,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" build:windows: summary: Builds the application for Windows @@ -79,6 +80,7 @@ tasks: env: CGO_CFLAGS: "-mmacosx-version-min=10.13" CGO_LDFLAGS: "-mmacosx-version-min=10.13" + MACOSX_DEPLOYMENT_TARGET: "10.13" vars: ARCH: $GOARCH