Merge remote-tracking branch 'benma/go122' into release-v4.46.1

.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:

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

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:

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.

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 {

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

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/

frontends/qt/resources/MacOS/Info.plist

@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.46.0</string>
+	<string>4.46.1</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.46.0</string>
+	<string>4.46.1</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

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"

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

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

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"