fix: resolved gomobile issue

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ env:
   # https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images
   #
   # Keep this in sync with default in scripts/github-ci.sh.
-  CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:23
+  CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:24
   GITHUB_BUILD_DIR: ${{github.workspace}}
 
 jobs:

.golangci.yml

@@ -86,6 +86,8 @@ linters:
     - wsl
     - execinquery
     - ireturn
+    - copyloopvar
+    - intrange
     - wrapcheck
     - varnamelen
     - tagliatelle

Makefile

@@ -25,10 +25,8 @@ envinit:
 	go install github.com/vektra/mockery/v2@latest
 	go install github.com/matryer/moq@latest
 	go install golang.org/x/tools/cmd/goimports@latest
-	go install golang.org/x/mobile/cmd/gomobile@latest
-	# The gomobile/gobind libs are also needed when using `gomobile bind`, but it's not compatible with vendoring:
-	# https://github.com/golang/go/issues/50994#issuecomment-1032754206
-	GO111MODULE=off go get -u golang.org/x/mobile/cmd/gomobile
+	# TODO: replace with go install golang.org/x/mobile/cmd/gomobile@latest once https://github.com/golang/mobile/pull/105 is merged.
+	git clone https://github.com/BitBoxSwiss/mobile.git && cd /tmp/mobile/cmd/gomobile && go install .
 	gomobile init
 # Initializiation on MacOS
 #  - run make from $GOPATH/src/github.com/BitBoxSwiss/bitbox-wallet-app

android-env.mk.inc

@@ -1,2 +1,4 @@
 export ANDROID_SDK_ROOT := /opt/android-sdk
 export ANDROID_NDK_HOME := /opt/android-sdk/ndk/21.2.6472646
+# gomodcache location for gomobile build pkgs. Set to tmp folder, because writing access is needed.
+export GOMODCACHE_ROOT := /tmp/gomodcache/pkg/mod

appveyor.yml

@@ -9,7 +9,8 @@ environment:
       GOTOOLCHAIN: local
       PLATFORM: amd64
       COMPILER: msvc
-
+# https://www.appveyor.com/docs/windows-images-software/#golang
+# If you change this, also change the GOROOT variable above to point to the right installation folder.
 stack: go 1.22
 
 install:

backend/mobileserver/Makefile

@@ -1,11 +1,10 @@
 include ../../android-env.mk.inc
 
-# go mod makes the Android build hang forever. Remove this once we move to go modules in a controlled fashion.
-# Probably a variation of https://github.com/golang/go/issues/27234 - solution is to build it using vendored deps
-# by turning off GO111MODULE. See also: https://github.com/golang/go/issues/34181#issuecomment-640260162
+# GOMODCACHE to /tmp directory, because gomobile needs to write pkgs.
+# Also set -glflags to fix the vendor issue with gomobile, see: https://github.com/golang/go/issues/67927#issuecomment-2241523694
 build-android:
-	GO111MODULE=off ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -ldflags="-s -w" -target android .
+	GOMODCACHE=${GOMODCACHE_ROOT} ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w" -target android .
 build-ios:
-	GO111MODULE=off gomobile bind -x -a -ldflags="-s -w" -target ios,iossimulator .
+	GOMODCACHE=${GOMODCACHE_ROOT} gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w" -target ios,iossimulator .
 clean:
 	rm -f mobileserver.aar mobileserver-sources.jar

backend/mobileserver/implicit.go

@@ -0,0 +1,9 @@
+// This file imports the packages required by gomobile so they can be vendored.
+
+package mobileserver
+
+import (
+	_ "golang.org/x/mobile/bind"
+	_ "golang.org/x/mobile/bind/java"
+	_ "golang.org/x/mobile/bind/objc"
+)

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	go.etcd.io/bbolt v1.3.10
 	golang.org/x/crypto v0.25.0
+	golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6
 	golang.org/x/net v0.27.0
 )
 
@@ -54,8 +55,10 @@ require (
 	github.com/tklauser/numcpus v0.8.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/tools v0.23.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect

scripts/github-ci.sh

@@ -12,7 +12,7 @@ if [ "$OS_NAME" == "linux" ]; then
     # Which docker image to use to run the CI. Defaults to Docker Hub.
     # Overwrite with CI_IMAGE=docker/image/path environment variable.
     # Keep this in sync with .github/workflows/ci.yml.
-    : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:23}"
+    : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:24}"
     # Time image pull to compare in the future.
     time docker pull "$CI_IMAGE"