Merge branch 'update-v4.18.0'

BitBoxSwiss · Mar 24, 2020 · e82f81f · e82f81f
2 parents f9571be + 4c6e0a8
commit e82f81f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/backend/devices/bitbox02bootloader/assets.go b/backend/devices/bitbox02bootloader/assets.go
diff --git a/backend/devices/bitbox02bootloader/firmware.go b/backend/devices/bitbox02bootloader/firmware.go
@@ -30,11 +30,11 @@ type firmwareInfo struct {
 
 var bundledFirmwares = map[bitbox02common.Product]firmwareInfo{
 	bitbox02common.ProductBitBox02Multi: {
-		version:  semver.NewSemVer(6, 1, 0),
+		version:  semver.NewSemVer(7, 0, 0),
 		filename: "assets/firmware.v%s.signed.bin",
 	},
 	bitbox02common.ProductBitBox02BTCOnly: {
-		version:  semver.NewSemVer(6, 1, 0),
+		version:  semver.NewSemVer(7, 0, 0),
 		filename: "assets/firmware-btc.v%s.signed.bin",
 	},
 }

diff --git a/backend/update.go b/backend/update.go
@@ -27,7 +27,7 @@ const updateFileURL = "https://shiftcrypto.ch/updates/desktop.json"
 
 var (
 	// Version of the backend as displayed to the user.
-	Version = semver.NewSemVer(4, 17, 2)
+	Version = semver.NewSemVer(4, 18, 0)
 )
 
 // UpdateFile is retrieved from the server.

diff --git 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 29
-        versionCode 8
-        versionName "android-4.17.2"
+        versionCode 9
+        versionName "android-4.18.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/frontends/qt/Makefile b/frontends/qt/Makefile
@@ -35,8 +35,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.17.2 -C ../tmp-deb/
-	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.17.2 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.18.0 -C ../tmp-deb/
+	cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.18.0 -C ../tmp-deb/
 	# create AppImage
 	cd build/linux-tmp && /opt/linuxdeployqt-6-x86_64.AppImage BitBox -appimage
 	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
@@ -21,10 +21,10 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>4.17.2</string>
+	<string>4.18.0</string>
 
 	<key>CFBundleShortVersionString</key>
-	<string>4.17.2</string>
+	<string>4.18.0</string>
 
 	<key>CFBundleSignature</key>
 	<string>????</string>

diff --git a/frontends/qt/setup.nsi b/frontends/qt/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 4.17.2.0
+!define VERSION 4.18.0.0
 !define COMPANY "Shift Cryptosecurity AG"
 !define URL https://github.com/digitalbitbox/bitbox-wallet-app/releases/
 !define BINDIR "build\windows"

diff --git a/frontends/web/src/locales/sl/app.json b/frontends/web/src/locales/sl/app.json
@@ -641,8 +641,8 @@
         "text": "www.cryptocompare.com",
         "url": "https://www.cryptocompare.com"
       },
-      "text": "Menjalni tečaji se vsako minuto posodobi s strani CryptoCompare, www.cryptocompare.com.",
-      "title": "Od kod prikazani menjalni tečaji?"
+      "text": "Menjalni tečaji se vsako minuto posodobijo s strani CryptoCompare, www.cryptocompare.com.",
+      "title": "Od kod izvirajo prikazani menjalni tečaji?"
     },
     "accountReload": {
       "text": "Vsi podatki o transakcijah se posodabljajo samodejno.",