Skip to content

Commit 040a178

Browse files
baizonbaizon
committed
fix: resolved gomobile issue
1 parent 5bfa2f2 commit 040a178

File tree

6 files changed

+55
-5
lines changed

6 files changed

+55
-5
lines changed

‎Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ envinit:
2626
go install github.com/matryer/moq@latest
2727
go install golang.org/x/tools/cmd/goimports@latest
2828
go install golang.org/x/mobile/cmd/gomobile@latest
29-
# The gomobile/gobind libs are also needed when using `gomobile bind`, but it's not compatible with vendoring:
30-
# https://github.com/golang/go/issues/50994#issuecomment-1032754206
31-
GO111MODULE=off go get -u golang.org/x/mobile/cmd/gomobile
3229
gomobile init
3330
# Initializiation on MacOS
3431
# - run make from $GOPATH/src/github.com/BitBoxSwiss/bitbox-wallet-app

‎backend/mobileserver/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ include ../../android-env.mk.inc
44
# Probably a variation of https://github.com/golang/go/issues/27234 - solution is to build it using vendored deps
55
# by turning off GO111MODULE. See also: https://github.com/golang/go/issues/34181#issuecomment-640260162
66
build-android:
7-
GO111MODULE=off ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -ldflags="-s -w" -target android .
7+
ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags="-mod=mod" -ldflags="-s -w" -target android .
88
build-ios:
9-
GO111MODULE=off gomobile bind -x -a -ldflags="-s -w" -target ios,iossimulator .
9+
gomobile bind -x -a -glflags="-mod=mod" -ldflags="-s -w" -target ios,iossimulator .
1010
clean:
1111
rm -f mobileserver.aar mobileserver-sources.jar

‎backend/mobileserver/implicit.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// This file imports implicit dependencies required by generated code.
2+
3+
package mobileserver
4+
5+
import (
6+
_ "golang.org/x/mobile/bind"
7+
_ "golang.org/x/mobile/bind/java"
8+
_ "golang.org/x/mobile/bind/objc"
9+
)

‎go.mod

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ require (
2020
github.com/stretchr/testify v1.9.0
2121
go.etcd.io/bbolt v1.3.10
2222
golang.org/x/crypto v0.25.0
23+
golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6
2324
golang.org/x/net v0.27.0
2425
)
2526

2627
// TODO: remove once https://github.com/karalabe/hid/pull/52 is merged.
2728
replace github.com/karalabe/hid => github.com/benma/hid v0.0.0-20240312170000-f050ee197113
2829

30+
// TODO: remove once https://github.com/golang/mobile/pull/105 is merged.
31+
replace golang.org/x/mobile/cmd/gomobile => github.com/baizon/mobile/cmd/gomobile v0.0.0-20240721071641-1d3b1e5c533f
32+
2933
require (
3034
github.com/Microsoft/go-winio v0.6.2 // indirect
3135
github.com/aead/siphash v1.0.1 // indirect
@@ -54,8 +58,10 @@ require (
5458
github.com/tklauser/numcpus v0.8.0 // indirect
5559
github.com/yusufpapurcu/wmi v1.2.4 // indirect
5660
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
61+
golang.org/x/mod v0.19.0 // indirect
5762
golang.org/x/sync v0.7.0 // indirect
5863
golang.org/x/sys v0.22.0 // indirect
64+
golang.org/x/tools v0.23.0 // indirect
5965
google.golang.org/protobuf v1.34.1 // indirect
6066
gopkg.in/yaml.v3 v3.0.1 // indirect
6167
rsc.io/tmplfunc v0.0.3 // indirect

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,12 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
272272
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
273273
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 h1:LoYXNGAShUG3m/ehNk4iFctuhGX/+R1ZpfJ4/ia80JM=
274274
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
275+
golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6 h1:/VlmIrkuLf2wzPjkZ8imSpckHoW7Y71h66dxbLHSpi8=
276+
golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6/go.mod h1:TCsc78+c4cqb8IKEosz2LwJ6YRNkIjMuAYeHYjchGDE=
275277
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
276278
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
279+
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
280+
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
277281
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
278282
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
279283
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -337,6 +341,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
337341
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
338342
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
339343
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
344+
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
345+
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
340346
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
341347
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
342348
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎vendor/modules.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,19 @@ golang.org/x/crypto/sha3
250250
# golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
251251
## explicit; go 1.20
252252
golang.org/x/exp/maps
253+
# golang.org/x/mobile v0.0.0-20240716161057-1ad2df20a8b6
254+
## explicit; go 1.18
255+
golang.org/x/mobile/bind
256+
golang.org/x/mobile/bind/java
257+
golang.org/x/mobile/bind/objc
258+
golang.org/x/mobile/bind/seq
259+
golang.org/x/mobile/internal/importers
260+
golang.org/x/mobile/internal/importers/java
261+
golang.org/x/mobile/internal/importers/objc
262+
golang.org/x/mobile/internal/mobileinit
263+
# golang.org/x/mod v0.19.0
264+
## explicit; go 1.18
265+
golang.org/x/mod/semver
253266
# golang.org/x/net v0.27.0
254267
## explicit; go 1.18
255268
golang.org/x/net/internal/socks
@@ -262,6 +275,24 @@ golang.org/x/sync/errgroup
262275
golang.org/x/sys/cpu
263276
golang.org/x/sys/unix
264277
golang.org/x/sys/windows
278+
# golang.org/x/tools v0.23.0
279+
## explicit; go 1.19
280+
golang.org/x/tools/go/gcexportdata
281+
golang.org/x/tools/go/packages
282+
golang.org/x/tools/go/types/objectpath
283+
golang.org/x/tools/internal/aliases
284+
golang.org/x/tools/internal/event
285+
golang.org/x/tools/internal/event/core
286+
golang.org/x/tools/internal/event/keys
287+
golang.org/x/tools/internal/event/label
288+
golang.org/x/tools/internal/gcimporter
289+
golang.org/x/tools/internal/gocommand
290+
golang.org/x/tools/internal/packagesinternal
291+
golang.org/x/tools/internal/pkgbits
292+
golang.org/x/tools/internal/stdlib
293+
golang.org/x/tools/internal/tokeninternal
294+
golang.org/x/tools/internal/typesinternal
295+
golang.org/x/tools/internal/versions
265296
# google.golang.org/protobuf v1.34.1
266297
## explicit; go 1.17
267298
google.golang.org/protobuf/encoding/prototext
@@ -299,3 +330,4 @@ gopkg.in/yaml.v3
299330
rsc.io/tmplfunc
300331
rsc.io/tmplfunc/internal/parse
301332
# github.com/karalabe/hid => github.com/benma/hid v0.0.0-20240312170000-f050ee197113
333+
# golang.org/x/mobile/cmd/gomobile => github.com/baizon/mobile/cmd/gomobile v0.0.0-20240721071641-1d3b1e5c533f

0 commit comments

Comments
 (0)