Skip to content

Commit

Permalink
Merge pull request #4185 from andydotxyz/fix/playstore33
Browse files Browse the repository at this point in the history
We must support API 33 from Aug 31
  • Loading branch information
andydotxyz authored Aug 23, 2023
2 parents d2a24a9 + c6f3c6a commit 852632a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions cmd/fyne/internal/mobile/binres/binres.go
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,24 @@ func resolveElements(elms []*Element, pool, bxPool *Pool) {
b := el.attrs[j].Name.Resolve(bxPool)
return a < b
})
} else if el.Name.Resolve(bxPool) == "activity" {
// As above the android manifest seems to be very delicate - name must be first then exported before configChanges
sort.Slice(el.attrs, func(i, j int) bool {
a := el.attrs[i].Name.Resolve(bxPool)
if a == "name" {
return true
}

b := el.attrs[j].Name.Resolve(bxPool)
if a == "exported" {
return b != "name"
}

if b == "name" {
return false
}
return a < b
})
}

for _, child := range el.Children {
Expand Down
2 changes: 1 addition & 1 deletion cmd/fyne/internal/mobile/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func runBuildImpl(cmd *command) (*packages.Package, error) {
}
return pkg, nil
}
target := 31
target := 33
if !buildRelease {
target = 29 // TODO once we have gomobile debug signing working for v2 android signs
}
Expand Down

0 comments on commit 852632a

Please sign in to comment.