From 95c0c412e2b3d85f6951c00f9f8cbd3da19a1556 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 20 Nov 2024 22:50:49 +0100 Subject: [PATCH 1/3] envinit: use fixed versions of the mock tools The newer ones require Go 1.23 and fail our Docker image build if we use Go 1.22. We need to downgrade 1.23 to 1.22 b/c of a Go bug resulting in the Android app crashing on old Android versions. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 516dd19a65..6b8a04b6f7 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ catch: envinit: # Keep golangci-lint version in sync with what's in .github/workflows/ci.yml. curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.61.0 - go install github.com/vektra/mockery/v2@latest - go install github.com/matryer/moq@latest + go install github.com/vektra/mockery/v2@v2.46.0 + go install github.com/matryer/moq@v0.4.0 go install golang.org/x/tools/cmd/goimports@latest $(MAKE) gomobileinit gomobileinit: From fe1117fcbe07866113c4a17fb22763d06c462cc9 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 20 Nov 2024 23:47:52 +0100 Subject: [PATCH 2/3] go: downgrade from Go 1.23 to 1.22 to fix an Android bug Android app compiled with 1.23.2 or 1.23.3 crashes on old Android verisons (verified crash on Android 9 and Android 10). Until Go is fixed, we downgrade to the prevoius version we used that works. --- .github/workflows/ci.yml | 2 +- go.mod | 2 +- scripts/docker_install.sh | 2 +- scripts/github-ci.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daf5b996ed..95032e2d26 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,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:25 + CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:26 GITHUB_BUILD_DIR: ${{github.workspace}} jobs: diff --git a/go.mod b/go.mod index c30d0b3f30..430be73a8d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/BitBoxSwiss/bitbox-wallet-app -go 1.23 +go 1.22 require ( github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20240925080402-a2115fee878e diff --git a/scripts/docker_install.sh b/scripts/docker_install.sh index 132ed9c5be..e6a513db64 100755 --- a/scripts/docker_install.sh +++ b/scripts/docker_install.sh @@ -81,7 +81,7 @@ npm install -g npm@10 npm install -g locize-cli mkdir -p /opt/go_dist -curl https://dl.google.com/go/go1.23.2.linux-amd64.tar.gz | tar -xz -C /opt/go_dist +curl https://dl.google.com/go/go1.22.4.linux-amd64.tar.gz | tar -xz -C /opt/go_dist # fuse is needed to run the linuxdeployqt appimage. apt-get install -y --no-install-recommends fuse diff --git a/scripts/github-ci.sh b/scripts/github-ci.sh index 23f4f5c8fe..2b893fcb83 100755 --- a/scripts/github-ci.sh +++ b/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:25}" + : "${CI_IMAGE:=shiftcrypto/bitbox-wallet-app:26}" # Time image pull to compare in the future. time docker pull "$CI_IMAGE" From 758fcb9e5bc0deac9762848af0cb6924e313ce24 Mon Sep 17 00:00:00 2001 From: Marko Bencun Date: Wed, 20 Nov 2024 23:51:58 +0100 Subject: [PATCH 3/3] backend: update to version 4.46.1 --- CHANGELOG.md | 3 +++ backend/update.go | 2 +- frontends/android/BitBoxApp/app/build.gradle | 4 ++-- frontends/ios/BitBoxApp/Config.xcconfig | 4 ++-- frontends/qt/Makefile | 4 ++-- frontends/qt/resources/MacOS/Info.plist | 4 ++-- frontends/qt/setup.nsi | 2 +- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a5f541c39..27997d447a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +# 4.46.1 +- Fix Android app crash on old Android versions + # 4.46.0 - Android: enable export logs feature - Label change UTXOs as "change" in coin control diff --git a/backend/update.go b/backend/update.go index e239d8a8ef..f4dc9cb78f 100644 --- a/backend/update.go +++ b/backend/update.go @@ -27,7 +27,7 @@ const updateFileURL = "https://bitboxapp.shiftcrypto.io/desktop.json" var ( // Version of the backend as displayed to the user. - Version = semver.NewSemVer(4, 46, 0) + Version = semver.NewSemVer(4, 46, 1) ) // UpdateFile is retrieved from the server. diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle index 7ff402633f..3bdbbad1ff 100644 --- a/frontends/android/BitBoxApp/app/build.gradle +++ b/frontends/android/BitBoxApp/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "ch.shiftcrypto.bitboxapp" minSdkVersion 21 targetSdkVersion 34 - versionCode 55 - versionName "android-4.46.0" + versionCode 56 + versionName "android-4.46.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/frontends/ios/BitBoxApp/Config.xcconfig b/frontends/ios/BitBoxApp/Config.xcconfig index 4b898156bf..756f1f5db9 100644 --- a/frontends/ios/BitBoxApp/Config.xcconfig +++ b/frontends/ios/BitBoxApp/Config.xcconfig @@ -2,8 +2,8 @@ // https://help.apple.com/xcode/#/dev745c5c974 // App version -MARKETING_VERSION = 4.46.0 +MARKETING_VERSION = 4.46.1 // Build number, increment this for every separate publication, // even if the app version is the same. -CURRENT_PROJECT_VERSION = 3 +CURRENT_PROJECT_VERSION = 4 diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile index ce5e8e8f1f..d31a0a9433 100644 --- a/frontends/qt/Makefile +++ b/frontends/qt/Makefile @@ -37,8 +37,8 @@ linux: cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp mkdir build/tmp-deb/opt/ cp -aR build/linux-tmp build/tmp-deb/opt/bitbox - cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.46.0 -C ../tmp-deb/ - cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.46.0 -C ../tmp-deb/ + cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.46.1 -C ../tmp-deb/ + cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.46.1 -C ../tmp-deb/ # create AppImage cd build/linux-tmp && /opt/linuxdeployqt-continuous-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/ diff --git a/frontends/qt/resources/MacOS/Info.plist b/frontends/qt/resources/MacOS/Info.plist index 7282f25bb9..a43c572a2d 100644 --- a/frontends/qt/resources/MacOS/Info.plist +++ b/frontends/qt/resources/MacOS/Info.plist @@ -21,10 +21,10 @@ APPL CFBundleVersion - 4.46.0 + 4.46.1 CFBundleShortVersionString - 4.46.0 + 4.46.1 CFBundleSignature ???? diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi index 9c094943c2..277221fb95 100755 --- a/frontends/qt/setup.nsi +++ b/frontends/qt/setup.nsi @@ -22,7 +22,7 @@ SetCompressor /SOLID lzma # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 4.46.0.0 +!define VERSION 4.46.1.0 !define COMPANY "Shift Crypto AG" !define URL https://github.com/BitBoxSwiss/bitbox-wallet-app/releases/ !define BINDIR "build\windows"