Skip to content

Commit 0871796

Browse files
committed
Merge remote-tracking branch 'benma/update'
2 parents 03cbbe0 + d19b765 commit 0871796

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

backend/devices/bitbox02/api/device.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
var (
3838
lowestSupportedFirmwareVersion = semver.NewSemVer(4, 2, 1)
39-
lowestSupportedFirmwareVersionBTCOnly = semver.NewSemVer(4, 2, 1)
39+
lowestSupportedFirmwareVersionBTCOnly = semver.NewSemVer(4, 2, 2)
4040
lowestNonSupportedFirmwareVersion = semver.NewSemVer(5, 0, 0)
4141
)
4242

backend/devices/bitbox02bootloader/assets.go

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/devices/bitbox02bootloader/firmware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var bundledFirmwares = map[bitbox02common.Edition]firmwareInfo{
3434
filename: "assets/firmware.v%s.signed.bin",
3535
},
3636
bitbox02common.EditionBTCOnly: {
37-
version: semver.NewSemVer(4, 2, 1),
37+
version: semver.NewSemVer(4, 2, 2),
3838
filename: "assets/firmware-btc.v%s.signed.bin",
3939
},
4040
}

backend/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
2626

2727
var (
2828
// Version of the backend as displayed to the user.
29-
Version = semver.NewSemVer(4, 14, 0)
29+
Version = semver.NewSemVer(4, 14, 1)
3030
)
3131

3232
// UpdateFile is retrieved from the server.

frontends/qt/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ linux:
3535
cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
3636
mkdir build/tmp-deb/opt/
3737
cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
38-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.14.0 -C ../tmp-deb/
39-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.14.0 -C ../tmp-deb/
38+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.14.1 -C ../tmp-deb/
39+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.14.1 -C ../tmp-deb/
4040
# create AppImage
4141
cd build/linux-tmp && /opt/linuxdeployqt-6-x86_64.AppImage BitBox -appimage
4242
mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/

frontends/qt/resources/MacOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleVersion</key>
24-
<string>4.14.0</string>
24+
<string>4.14.1</string>
2525

2626
<key>CFBundleShortVersionString</key>
27-
<string>4.14.0</string>
27+
<string>4.14.1</string>
2828

2929
<key>CFBundleSignature</key>
3030
<string>????</string>

frontends/qt/setup.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
55

66
# General Symbol Definitions
77
!define REGKEY "SOFTWARE\$(^Name)"
8-
!define VERSION 4.14.0.0
8+
!define VERSION 4.14.1.0
99
!define COMPANY "Shift Cryptosecurity AG"
1010
!define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
1111
!define BINDIR "build\windows"

0 commit comments

Comments
 (0)