Skip to content

Bump go version #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acrespo wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Bump go version #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad25e07
Bump go version
acrespo Jul 8, 2024
725a91e
Fix build problem during gomobile gobind exec
acrespo Jul 8, 2024
40997e4
Apollo: fix gomobile setup issue
acrespo Jul 8, 2024
b9b9d80
Apollo: try full package fix
acrespo Jul 8, 2024
d44ca89
Apollo: run go get github.com/muun/libwallet
acrespo Jul 8, 2024
e69daa0
Apollo: run go get golang.org/x/mobile/cmd/gomobile@v0.0.0-2022041415…
acrespo Jul 8, 2024
848f91a
Apollo: new extra param is required in gomobile invocation
acrespo Jul 8, 2024
755137c
Revert "Fix build problem during gomobile gobind exec"
acrespo Jul 9, 2024
4347b65
Run go mod tidy + go get golang.org/x/mobile/cmd/gomobile
acrespo Jul 9, 2024
1ba63cb
Replace darbelo personal fork ref with muun official gombile fork
acrespo Jul 9, 2024
71a547e
Rm go.sum no longer needed entries
acrespo Jul 9, 2024
e396b54
Mv bootstrap-gomobile.sh to libwallet-android.sh
acrespo Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM --platform=linux/amd64 openjdk:17-jdk-buster@sha256:9217da81dcff19e60861791
ENV NDK_VERSION 22.0.7026061
ENV ANDROID_PLATFORM_VERSION 28
ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
ENV GO_VERSION 1.18.1
ENV GO_VERSION 1.21.11

RUN apt-get update \
&& apt-get install --yes --no-install-recommends \
Expand Down Expand Up @@ -60,8 +60,7 @@ FROM muun_android_builder AS build

WORKDIR /src
COPY . /src
RUN tools/bootstrap-gomobile.sh \
&& (cd libwallet; go clean) \
RUN (cd libwallet; go clean) \
&& ./gradlew :android:apollo:clean :android:apolloui:clean \
&& ./gradlew :android:libwallet:build :android:apolloui:assembleProdRelease

Expand Down
11 changes: 4 additions & 7 deletions libwallet/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@ module github.com/muun/libwallet
go 1.14

require (
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/btcsuite/btcd v0.20.1-beta.0.20200515232429-9f0179fd2c46
github.com/btcsuite/btcutil v1.0.2
github.com/fiatjaf/go-lnurl v1.3.1
github.com/google/uuid v1.1.1
github.com/jinzhu/gorm v1.9.16
github.com/lightningnetwork/lightning-onion v1.0.1
github.com/lightningnetwork/lnd v0.10.4-beta
github.com/miekg/dns v1.1.29 // indirect
github.com/pdfcpu/pdfcpu v0.3.11
github.com/pkg/errors v0.9.1
github.com/shopspring/decimal v1.2.0
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/crypto v0.25.0
golang.org/x/image v0.18.0 // indirect
golang.org/x/mobile v0.0.0-20220414153400-ce6a79cf6a13 // indirect
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/net v0.27.0 // indirect
google.golang.org/protobuf v1.25.0
gopkg.in/gormigrate.v1 v1.6.0
)

// Fork that includes the -cache flag for quicker builds
replace golang.org/x/mobile => github.com/muun/mobile v0.0.0-20220913162405-8cc629edd37b
replace golang.org/x/mobile => github.com/muun/mobile v0.0.0-20240709203120-049ae58602a0
Loading