Skip to content

Commit 38d34d9

Browse files
ellemoutonellemouton
committed
mobile: convert into a go module
1 parent fe3f6b7 commit 38d34d9

File tree

6 files changed

+1455
-13
lines changed

6 files changed

+1455
-13
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ macos:
9999
android:
100100
@$(call print, "Building Android library ($(ANDROID_BUILD)).")
101101
mkdir -p $(ANDROID_BUILD_DIR)
102-
GOOS=js $(GOMOBILE_BIN) bind -target=android -tags="mobile $(DEV_TAGS) $(RPC_TAGS)" -androidapi 21 $(LDFLAGS_MOBILE) -v -o $(ANDROID_BUILD) $(MOBILE_PKG)
102+
cd mobile; GOOS=js $(GOMOBILE_BIN) bind -target=android -tags="mobile $(DEV_TAGS) $(RPC_TAGS)" -androidapi 21 $(LDFLAGS_MOBILE) -v -o $(ANDROID_BUILD) $(MOBILE_PKG)
103103

104104
mobile: ios android
105105

‎go.mod

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ require (
44
github.com/btcsuite/btcd/btcec/v2 v2.2.2
55
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
66
github.com/go-errors/errors v1.0.1
7-
github.com/golang/protobuf v1.5.2
87
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
98
github.com/kkdai/bstream v1.0.0
109
github.com/lightninglabs/aperture v0.1.18-beta
@@ -20,7 +19,6 @@ require (
2019
google.golang.org/grpc v1.39.0
2120
google.golang.org/protobuf v1.27.1
2221
gopkg.in/macaroon-bakery.v2 v2.0.1
23-
gopkg.in/macaroon.v2 v2.1.0
2422
nhooyr.io/websocket v1.8.7
2523
)
2624

@@ -59,6 +57,7 @@ require (
5957
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
6058
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
6159
github.com/gogo/protobuf v1.3.2 // indirect
60+
github.com/golang/protobuf v1.5.2 // indirect
6261
github.com/golang/snappy v0.0.4 // indirect
6362
github.com/google/btree v1.0.1 // indirect
6463
github.com/gorilla/websocket v1.4.2 // indirect
@@ -85,11 +84,8 @@ require (
8584
github.com/klauspost/pgzip v1.2.5 // indirect
8685
github.com/lib/pq v1.10.3 // indirect
8786
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
88-
github.com/lightninglabs/lndclient v0.16.0-2 // indirect
89-
github.com/lightninglabs/loop/swapserverrpc v1.0.1 // indirect
87+
github.com/lightninglabs/lndclient v0.15.0-12 // indirect
9088
github.com/lightninglabs/neutrino v0.14.2 // indirect
91-
github.com/lightninglabs/pool/auctioneerrpc v1.0.7 // indirect
92-
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display // indirect
9389
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 // indirect
9490
github.com/lightningnetwork/lnd/cert v1.1.1 // indirect
9591
github.com/lightningnetwork/lnd/clock v1.1.0 // indirect
@@ -151,6 +147,7 @@ require (
151147
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
152148
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
153149
gopkg.in/errgo.v1 v1.0.1 // indirect
150+
gopkg.in/macaroon.v2 v2.1.0 // indirect
154151
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
155152
gopkg.in/yaml.v2 v2.4.0 // indirect
156153
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -563,21 +563,16 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2X
563563
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
564564
github.com/lightninglabs/lndclient v0.15.0-0/go.mod h1:ORS/YFe9hAXlzN/Uj+gvTmrnXEml6yD6dWwzCjpTJyQ=
565565
github.com/lightninglabs/lndclient v0.15.0-10/go.mod h1:x5ZVWYON0qnlUIeQL/da8vk3b5zNhODlHb9GJJBVMMo=
566+
github.com/lightninglabs/lndclient v0.15.0-12 h1:oj4WouJ7c/zmFXAHELffvJwVS7iuEDUSTzMrNDUXv/g=
566567
github.com/lightninglabs/lndclient v0.15.0-12/go.mod h1:x5ZVWYON0qnlUIeQL/da8vk3b5zNhODlHb9GJJBVMMo=
567-
github.com/lightninglabs/lndclient v0.16.0-2 h1:wZc42eUoWycOxY85F/Sm66e23TTnM9kGcS2+iscGU68=
568-
github.com/lightninglabs/lndclient v0.16.0-2/go.mod h1:G4D4/rcEnbdl8I0cTUO7oaJgEGa8WrplMv2IuPy1xu0=
569568
github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016 h1:jp60FehtoNCVTEs2CULG9coQd/9pdq9Z+K9ImxslSd8=
570569
github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016/go.mod h1:GLJr71AOL9/DM/IkZHWGIvKR8RkjWtaYPXq5qKnSp4A=
571-
github.com/lightninglabs/loop/swapserverrpc v1.0.1 h1:z99vrpRgQ834FC/C0Qx8HLtE0RX0WBDa1gAu7yOGPsg=
572570
github.com/lightninglabs/loop/swapserverrpc v1.0.1/go.mod h1:imy1/sqnb70EEyBKMo4pHwwLBPW8uYahWZ8s+1Xcq1o=
573571
github.com/lightninglabs/neutrino v0.13.2/go.mod h1:Cv/v8oHiPhuGiGvGgO+rIMhwCwEdsQFu6as840i2afw=
574572
github.com/lightninglabs/neutrino v0.14.2 h1:yrnZUCYMZ5ECtXhgDrzqPq2oX8awoAN2D/cgCewJcCo=
575573
github.com/lightninglabs/neutrino v0.14.2/go.mod h1:OICUeTCn+4Tu27YRJIpWvvqySxx4oH4vgdP33Sw9RDc=
576574
github.com/lightninglabs/pool v0.5.8-alpha h1:+sCYlzBpXe07ALsp1b6IavaMKnHbHsNZuB7/T15PFfI=
577575
github.com/lightninglabs/pool v0.5.8-alpha/go.mod h1:0DMGQcDuAPheqzWZEv8ZE0Qptdpl1KPwM4ERGjybIX8=
578-
github.com/lightninglabs/pool/auctioneerrpc v1.0.7 h1:+a1ynzXAHDlFT4pOeKeAfV38rlwRX3wVdKnGxggtDEQ=
579-
github.com/lightninglabs/pool/auctioneerrpc v1.0.7/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo=
580-
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display h1:RZJ8H4ueU/aQ9pFtx5wqsuD3B/DezrewJeVwDKKYY8E=
581576
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE=
582577
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE=
583578
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 h1:TkKwqFcQTGYoI+VEqyxA8rxpCin8qDaYX0AfVRinT3k=

‎mobile/deps.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package mobile
2+
3+
import _ "golang.org/x/mobile/bind"

‎mobile/go.mod

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
module github.com/lightninglabs/lightning-node-connect/mobile
2+
3+
require (
4+
github.com/btcsuite/btcd/btcec/v2 v2.3.2
5+
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
6+
github.com/golang/protobuf v1.5.2
7+
github.com/lightninglabs/faraday v0.2.9-alpha
8+
github.com/lightninglabs/lightning-node-connect v0.2.1-alpha
9+
github.com/lightninglabs/loop v0.21.0-beta
10+
github.com/lightninglabs/pool v0.6.1-beta
11+
github.com/lightningnetwork/lnd v0.15.5-beta
12+
golang.org/x/mobile v0.0.0-20221110043201-43a038452099
13+
google.golang.org/grpc v1.51.0
14+
gopkg.in/macaroon-bakery.v2 v2.3.0
15+
gopkg.in/macaroon.v2 v2.1.0
16+
)
17+
18+
require (
19+
github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e // indirect
20+
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82 // indirect
21+
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
22+
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
23+
github.com/aead/siphash v1.0.1 // indirect
24+
github.com/andybalholm/brotli v1.0.3 // indirect
25+
github.com/beorn7/perks v1.0.1 // indirect
26+
github.com/btcsuite/btcd v0.23.4 // indirect
27+
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
28+
github.com/btcsuite/btcd/btcutil/psbt v1.1.5 // indirect
29+
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
30+
github.com/btcsuite/btcwallet v0.16.5 // indirect
31+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 // indirect
32+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
33+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.3 // indirect
34+
github.com/btcsuite/btcwallet/walletdb v1.4.0 // indirect
35+
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 // indirect
36+
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
37+
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
38+
github.com/btcsuite/winsvc v1.0.0 // indirect
39+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
40+
github.com/coreos/go-semver v0.3.0 // indirect
41+
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
42+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
43+
github.com/davecgh/go-spew v1.1.1 // indirect
44+
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
45+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
46+
github.com/decred/dcrd/lru v1.0.0 // indirect
47+
github.com/dsnet/compress v0.0.1 // indirect
48+
github.com/dustin/go-humanize v1.0.0 // indirect
49+
github.com/dvyukov/go-fuzz v0.0.0-20210602112143-b1f3d6f4ef4e // indirect
50+
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
51+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
52+
github.com/go-errors/errors v1.0.1 // indirect
53+
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
54+
github.com/gogo/protobuf v1.3.2 // indirect
55+
github.com/golang/snappy v0.0.4 // indirect
56+
github.com/google/btree v1.0.1 // indirect
57+
github.com/gorilla/websocket v1.4.2 // indirect
58+
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
59+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
60+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
61+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 // indirect
62+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
63+
github.com/jackc/pgconn v1.10.0 // indirect
64+
github.com/jackc/pgio v1.0.0 // indirect
65+
github.com/jackc/pgpassfile v1.0.0 // indirect
66+
github.com/jackc/pgproto3/v2 v2.1.1 // indirect
67+
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
68+
github.com/jackc/pgtype v1.8.1 // indirect
69+
github.com/jackc/pgx/v4 v4.13.0 // indirect
70+
github.com/jackpal/gateway v1.0.5 // indirect
71+
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
72+
github.com/jessevdk/go-flags v1.4.0 // indirect
73+
github.com/jonboulle/clockwork v0.2.2 // indirect
74+
github.com/jrick/logrotate v1.0.0 // indirect
75+
github.com/json-iterator/go v1.1.11 // indirect
76+
github.com/kkdai/bstream v1.0.0 // indirect
77+
github.com/klauspost/compress v1.13.6 // indirect
78+
github.com/klauspost/pgzip v1.2.5 // indirect
79+
github.com/lib/pq v1.10.3 // indirect
80+
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
81+
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
82+
github.com/lightninglabs/loop/swapserverrpc v1.0.1 // indirect
83+
github.com/lightninglabs/neutrino v0.14.2 // indirect
84+
github.com/lightninglabs/pool/auctioneerrpc v1.0.7 // indirect
85+
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display // indirect
86+
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 // indirect
87+
github.com/lightningnetwork/lnd/cert v1.1.1 // indirect
88+
github.com/lightningnetwork/lnd/clock v1.1.0 // indirect
89+
github.com/lightningnetwork/lnd/healthcheck v1.2.2 // indirect
90+
github.com/lightningnetwork/lnd/kvdb v1.3.1 // indirect
91+
github.com/lightningnetwork/lnd/queue v1.1.0 // indirect
92+
github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
93+
github.com/lightningnetwork/lnd/tlv v1.0.3 // indirect
94+
github.com/lightningnetwork/lnd/tor v1.0.2 // indirect
95+
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
96+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
97+
github.com/mholt/archiver/v3 v3.5.0 // indirect
98+
github.com/miekg/dns v1.1.43 // indirect
99+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
100+
github.com/modern-go/reflect2 v1.0.1 // indirect
101+
github.com/nwaples/rardecode v1.1.2 // indirect
102+
github.com/pierrec/lz4/v4 v4.1.8 // indirect
103+
github.com/pmezard/go-difflib v1.0.0 // indirect
104+
github.com/prometheus/client_golang v1.11.0 // indirect
105+
github.com/prometheus/client_model v0.2.0 // indirect
106+
github.com/prometheus/common v0.26.0 // indirect
107+
github.com/prometheus/procfs v0.6.0 // indirect
108+
github.com/rogpeppe/fastuuid v1.2.0 // indirect
109+
github.com/sirupsen/logrus v1.7.0 // indirect
110+
github.com/soheilhy/cmux v0.1.5 // indirect
111+
github.com/spf13/pflag v1.0.5 // indirect
112+
github.com/stretchr/objx v0.4.0 // indirect
113+
github.com/stretchr/testify v1.8.0 // indirect
114+
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
115+
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
116+
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
117+
github.com/ulikunitz/xz v0.5.10 // indirect
118+
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
119+
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
120+
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
121+
go.etcd.io/bbolt v1.3.6 // indirect
122+
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
123+
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
124+
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
125+
go.etcd.io/etcd/client/v3 v3.5.1 // indirect
126+
go.etcd.io/etcd/pkg/v3 v3.5.1 // indirect
127+
go.etcd.io/etcd/raft/v3 v3.5.1 // indirect
128+
go.etcd.io/etcd/server/v3 v3.5.1 // indirect
129+
go.opentelemetry.io/contrib v0.20.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
131+
go.opentelemetry.io/otel v0.20.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
133+
go.opentelemetry.io/otel/metric v0.20.0 // indirect
134+
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
135+
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
136+
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
137+
go.opentelemetry.io/otel/trace v0.20.0 // indirect
138+
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
139+
go.uber.org/atomic v1.7.0 // indirect
140+
go.uber.org/multierr v1.6.0 // indirect
141+
go.uber.org/zap v1.17.0 // indirect
142+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
143+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
144+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
145+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
146+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
147+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
148+
golang.org/x/text v0.4.0 // indirect
149+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
150+
golang.org/x/tools v0.1.12 // indirect
151+
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
152+
google.golang.org/protobuf v1.27.1 // indirect
153+
gopkg.in/errgo.v1 v1.0.1 // indirect
154+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
155+
gopkg.in/yaml.v2 v2.4.0 // indirect
156+
gopkg.in/yaml.v3 v3.0.1 // indirect
157+
nhooyr.io/websocket v1.8.7 // indirect
158+
sigs.k8s.io/yaml v1.2.0 // indirect
159+
)
160+
161+
replace github.com/lightninglabs/lightning-node-connect => ../
162+
163+
go 1.18

0 commit comments

Comments
 (0)