Merge branch 'develop' into fix-android-release

.github/FUNDING.yml

@@ -1 +1 @@
-github: [fyne-io, Jacalz]
+github: [fyne-io, Jacalz, lucor]

.github/dependabot.yaml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+

.github/workflows/ci.yml

@@ -9,10 +9,10 @@ jobs:
     - name: Setup Go environment
       uses: actions/setup-go@v3
       with:
-        go-version: "1.19.x"
+        go-version: "1.23.x"
 
     - name: Install staticcheck
-      run: go install honnef.co/go/tools/cmd/staticcheck@latest
+      run: go install honnef.co/go/tools/cmd/staticcheck@v0.4.7
     - name: Install goimports
       run: go install golang.org/x/tools/cmd/goimports@latest
 
@@ -34,7 +34,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         # use max/min supported Go versions
-        go-version: ["1.18.x", "1.14.x"]
+        go-version: ["1.23.x", "1.19.x"]
 
     steps:
     - name: Setup Go environment
@@ -56,7 +56,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         # use max/min supported Go versions
-        go-version: ["1.18.x"]
+        go-version: ["1.19.x"]
 
     steps:
     - name: Setup Go environment
@@ -80,7 +80,7 @@ jobs:
       fail-fast: false
       matrix:
         # use max/min supported Go versions
-        go-version: ["1.18.x", "1.14.x"]
+        go-version: ["1.23.x", "1.19.x"]
         target:
           - os: linux
           - os: windows
@@ -119,7 +119,7 @@ jobs:
           path: calculator
 
       - name: Cache build artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/go/pkg/mod
@@ -131,11 +131,9 @@ jobs:
         working-directory: fyne-cross
         run: go install
 
-        # attempt to use "go install" but fallback to "go get"
       - name: Install Fyne
         run: |
-          go install fyne.io/fyne/v2/cmd/fyne@latest ||
-          go get fyne.io/fyne/v2/cmd/fyne@latest
+          go install fyne.io/fyne/v2/cmd/fyne@latest
 
       - name: Install Podman
         if: ${{ runner.os == 'macos' }}
@@ -162,7 +160,7 @@ jobs:
       fail-fast: false
       matrix:
         # use max/min supported Go versions
-        go-version: ["1.18.x", "1.14.x"]
+        go-version: ["1.23.x", "1.19.x"]
         target:
           - os: linux
           - os: windows
@@ -201,7 +199,7 @@ jobs:
           path: terminal
 
       - name: Cache build artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/go/pkg/mod
@@ -213,11 +211,9 @@ jobs:
         working-directory: fyne-cross
         run: go install
 
-        # attempt to use "go install" but fallback to "go get"
       - name: Install Fyne
         run: |
-          go install fyne.io/fyne/v2/cmd/fyne@latest ||
-          go get fyne.io/fyne/v2/cmd/fyne@latest
+          go install fyne.io/fyne/v2/cmd/fyne@latest
 
       - name: Install Podman
         if: ${{ runner.os == 'macos' }}

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog - Fyne.io fyne-cross
 
+## 1.6.0 - 31 Dec 2024
+
+### Changed
+- Bump github.com/stretchr/testify from 1.7.0 to 1.9.0 by @dependabot in https://github.com/fyne-io/fyne-cross/pull/233
+- Ldflags where only needed with older version of zig which we have updated since then. by @Bluebugs in https://github.com/fyne-io/fyne-cross/pull/246
+
+## 1.5.0 - 13 Apr 2024
+
+### Changed
+
+- Improve Docker Darwin support when using it has a host for fyne-cross (ssh-agent detection, documentation, arm64)
+- Support Podman on Darwin
+- Improve Android signature support
+- Propagate GOFLAGS correctly
+- Adjust supported Go version to match Fyne
+- Update dependencies
+
 ## 1.4.0 - 13 Mar 2023
 
 ### Added

README.md

@@ -17,6 +17,7 @@ Supported targets are:
   -  linux/arm
   -  linux/arm64
   -  windows/amd64
+  -  windows/arm64
   -  windows/386
   -  android ([multiple architectures](https://developer.android.com/ndk/guides/abis))
   -  android/386
@@ -27,8 +28,8 @@ Supported targets are:
 
 > Note: 
 > - iOS compilation is supported only on darwin hosts. See [fyne pre-requisites](https://developer.fyne.io/started/#prerequisites) for details.
-> - macOS packaging for public distrubution (release mode) is supported only on darwin hosts.
-> - windows packaging for public distrubution (release mode) is supported only on windows hosts.
+> - macOS packaging for public distribution (release mode) is supported only on darwin hosts.
+> - windows packaging for public distribution (release mode) is supported only on windows hosts.
 > - starting from v1.1.0:
 >   - cross-compile from NOT `darwin` (i.e. linux) to `darwin`: requires a copy of the macOS SDK on the host. The fyne-cross `darwin-sdk-extractor` command can be used to extract the SDK from the XCode CLI Tool file, see the [Extract the macOS SDK](#extract_macos_sdk) section below.
 >   - cross-compile from `darwin` to `darwin` by default will use under the hood the fyne CLI tool and requires Go and the macOS SDK installed on the host.
@@ -138,8 +139,12 @@ The fyne-cross `darwin-sdk-extractor` command can be used to extract the SDK fro
    terms before continuing.](https://www.apple.com/legal/sla/docs/xcode.pdf)**
 
 To extract the SDKs:
-1. [Download Command Line Tools for Xcode](https://developer.apple.com/download/all/?q=Command%20Line%20Tools) >= 12.4 (macOS SDK 11.x)
+1. [Download Command Line Tools for Xcode](https://developer.apple.com/download/all/?q=Command%20Line%20Tools) 12.4 (macOS SDK 11.x)
 2. Run: `fyne-cross darwin-sdk-extract --xcode-path /path/to/Command_Line_Tools_for_Xcode_12.5.dmg`
+  * Once extraction has been done, you should have a SDKs directory created. This directory contains at least 2 SDKs (ex. `SDKs/MacOSX12.3.sdk/` and `SDKs/MacOSX13.3.sdk/` in Command_Line_Tools_for_Xcode_14.3.1.dmg)
+3. Specify explicitly which SDK you want to use in your fyne-cross command with --macosx-sdk-path: `fyne-cross darwin --macosx-sdk-path /full/path/to/SDKs/MacOSX12.3.sdk -app-id your.app.id`
+
+> Note: current version supports only MacOS SDK 11.3
 
 ## Contribute
 

go.mod

@@ -1,17 +1,17 @@
 module github.com/fyne-io/fyne-cross
 
-go 1.17
+go 1.19
 
 require (
-	github.com/BurntSushi/toml v1.1.0
+	github.com/BurntSushi/toml v1.3.2
 	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9
-	github.com/aws/aws-sdk-go v1.41.19
+	github.com/aws/aws-sdk-go v1.51.13
 	github.com/klauspost/compress v1.13.4
 	github.com/mholt/archiver/v3 v3.5.1
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli/v2 v2.11.1
-	golang.org/x/sync v0.1.0
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
+	golang.org/x/sync v0.6.0
+	golang.org/x/sys v0.13.0
 	k8s.io/api v0.18.19
 	k8s.io/apimachinery v0.18.19
 	k8s.io/client-go v0.18.17
@@ -43,10 +43,11 @@ require (
 	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	google.golang.org/appengine v1.5.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect