-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
fix(darwin): update minimum macOS version from 10.15 to 12.0 #5253
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |||||
| <string>{{.CFBundleIconName}}</string> | ||||||
| {{- end}} | ||||||
| <key>LSMinimumSystemVersion</key> | ||||||
| <string>10.15.0</string> | ||||||
| <string>12.0</string> | ||||||
|
||||||
| <string>12.0</string> | |
| <string>12.0.0</string> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package test | ||
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "howett.net/plist" | ||
| ) | ||
|
|
||
| func TestDarwinInfoPlistMinVersion(t *testing.T) { | ||
| templates := []string{ | ||
| "../../internal/commands/updatable_build_assets/darwin/Info.plist.tmpl", | ||
| "../../internal/commands/updatable_build_assets/darwin/Info.dev.plist.tmpl", | ||
| } | ||
|
|
||
| expectedVersion := "12.0" | ||
|
|
||
| for _, tmpl := range templates { | ||
| t.Run(filepath.Base(tmpl), func(t *testing.T) { | ||
| data, err := os.ReadFile(tmpl) | ||
| if err != nil { | ||
| t.Fatalf("Failed to read template: %v", err) | ||
| } | ||
|
|
||
| content := string(data) | ||
|
|
||
| if !strings.Contains(content, expectedVersion) { | ||
| t.Errorf("Template %s does not contain expected minimum version %s", tmpl, expectedVersion) | ||
| } | ||
|
|
||
| if strings.Contains(content, "10.15") { | ||
| t.Errorf("Template %s still contains outdated 10.15 version", tmpl) | ||
| } | ||
|
|
||
| var plistDict map[string]any | ||
| _, err = plist.Unmarshal(data, &plistDict) | ||
| if err == nil { | ||
| minVer, ok := plistDict["LSMinimumSystemVersion"] | ||
| if ok && minVer != expectedVersion { | ||
| t.Errorf("LSMinimumSystemVersion = %v, want %s", minVer, expectedVersion) | ||
| } | ||
| } | ||
|
leaanthony marked this conversation as resolved.
Outdated
|
||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestDarwinTaskfileMinVersion(t *testing.T) { | ||
| taskfile := "../../internal/commands/build_assets/darwin/Taskfile.yml" | ||
|
|
||
| data, err := os.ReadFile(taskfile) | ||
| if err != nil { | ||
| t.Fatalf("Failed to read Taskfile: %v", err) | ||
| } | ||
|
|
||
| content := string(data) | ||
|
|
||
| if strings.Contains(content, "10.15") { | ||
| t.Errorf("Taskfile still contains outdated 10.15 version") | ||
| } | ||
|
|
||
| if !strings.Contains(content, "12.0") { | ||
| t.Errorf("Taskfile does not contain expected minimum version 12.0") | ||
| } | ||
|
|
||
| if !strings.Contains(content, "-mmacosx-version-min=12.0") { | ||
| t.Errorf("Taskfile CGO flags not updated to 12.0") | ||
| } | ||
|
|
||
| if !strings.Contains(content, `MACOSX_DEPLOYMENT_TARGET: "12.0"`) { | ||
| t.Errorf("Taskfile MACOSX_DEPLOYMENT_TARGET not updated to 12.0") | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LSMinimumSystemVersionwas previously expressed as a 3-segment version (e.g.10.15.0), but is now12.0. Elsewhere in the repo (egv3/examples/dev/build/Info.plist) the value uses amajor.minor.patchformat; consider using12.0.0for consistency and to avoid any potential parsing differences across macOS versions.