From 78f0df1748db625cd8c9c9d8d3bd3e8d8405bd6c Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Wed, 26 Mar 2025 17:36:13 +0200 Subject: [PATCH] Update mweb (#2076) * update mweb * update mweb (synchronization should be 2x faster) * update mweb version --- Dockerfile | 2 +- scripts/android/build_mwebd.sh | 8 ++++---- scripts/ios/build_mwebd.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9c99da0b..7fa47192e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ LABEL org.opencontainers.image.source=https://github.com/cake-tech/cake_wallet # Set necessary environment variables # Set Go version to latest known-working version -ENV GOLANG_VERSION=1.23.4 +ENV GOLANG_VERSION=1.24.1 # Pin Flutter version to latest known-working version ENV FLUTTER_VERSION=3.27.4 diff --git a/scripts/android/build_mwebd.sh b/scripts/android/build_mwebd.sh index cd4e2c1f4..3e9c5199d 100755 --- a/scripts/android/build_mwebd.sh +++ b/scripts/android/build_mwebd.sh @@ -1,9 +1,9 @@ if [[ "$1" == "--dont-install" ]]; then echo "Skipping Go installation as per --dont-install flag" else - # install go > 1.23: - wget https://go.dev/dl/go1.23.1.linux-amd64.tar.gz - sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.23.1.linux-amd64.tar.gz + # install go > 1.24: + wget https://go.dev/dl/go1.24.1.linux-amd64.tar.gz + sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin export PATH=$PATH:~/go/bin go install golang.org/x/mobile/cmd/gomobile@latest @@ -13,7 +13,7 @@ fi # build mwebd: git clone https://github.com/ltcmweb/mwebd cd mwebd -git reset --hard 555349415f76a42ec5c76152b64c4ab9aabc448f +git reset --hard f75cb9edef07d03360ee2d33e6edae4243a890b1 gomobile bind -target=android -androidapi 21 . mkdir -p ../../../cw_mweb/android/libs/ cp ./mwebd.aar $_ \ No newline at end of file diff --git a/scripts/ios/build_mwebd.sh b/scripts/ios/build_mwebd.sh index 5bdd32e15..456d43bb8 100755 --- a/scripts/ios/build_mwebd.sh +++ b/scripts/ios/build_mwebd.sh @@ -2,7 +2,7 @@ if [[ "$1" == "--dont-install" ]]; then echo "Skipping Go installation as per --dont-install flag" else - # install go > 1.23: + # install go > 1.24: brew install go export PATH=$PATH:~/go/bin go install golang.org/x/mobile/cmd/gomobile@latest @@ -12,7 +12,7 @@ fi # build mwebd: git clone https://github.com/ltcmweb/mwebd cd mwebd -git reset --hard 555349415f76a42ec5c76152b64c4ab9aabc448f +git reset --hard f75cb9edef07d03360ee2d33e6edae4243a890b1 gomobile bind -target=ios . mv -fn ./Mwebd.xcframework ../../../cw_mweb/ios/ # cleanup: