mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4331 from bisq-network/release/v1.3.5

Browse source 
Release/v1.3.5
This commit is contained in:
sqrrm 2020-06-23 15:54:28 +02:00 • committed by GitHub
commit b87ba9e5ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -378,7 +378,7 @@ configure(project(':desktop')) {
apply plugin: 'witness'
apply from: '../gradle/witness/gradle-witness.gradle'
version = '1.3.4-SNAPSHOT'
version = '1.3.5-SNAPSHOT'
mainClassName = 'bisq.desktop.app.BisqAppMain'

2
common/src/main/java/bisq/common/app/Version.java
View file

@ -27,7 +27,7 @@ public class Version {
// VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
// Therefore all sub versions start again with 1
// We use semantic versioning with major, minor and patch
public static final String VERSION = "1.3.4";
public static final String VERSION = "1.3.5";
public static int getMajorVersion(String version) {
return getSubVersion(version, 0);

2
desktop/package/linux/Dockerfile
View file

@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
ENV version 1.3.4-SNAPSHOT
ENV version 1.3.5-SNAPSHOT
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
apt-get install -y vim fakeroot

2
desktop/package/linux/package.sh
View file

@ -6,7 +6,7 @@
# - Update version below
# - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
version=1.3.4-SNAPSHOT
version=1.3.5-SNAPSHOT
version_base=$(echo $version | awk -F'[_-]' '{print $1}')
if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then

2
desktop/package/linux/release.sh
View file

@ -4,7 +4,7 @@
# Prior to running this script:
# - Update version below
version=1.3.4-SNAPSHOT
version=1.3.5-SNAPSHOT
base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
package_dir=$base_dir/desktop/package
release_dir=$base_dir/desktop/release/$version

6
desktop/package/macosx/Info.plist
View file

@ -5,10 +5,10 @@
<!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->
<key>CFBundleVersion</key>
<string>1.3.4</string>
<string>1.3.5</string>
<key>CFBundleShortVersionString</key>
<string>1.3.4</string>
<string>1.3.5</string>
<key>CFBundleExecutable</key>
<string>Bisq</string>
@ -26,7 +26,7 @@
<string>public.app-category.finance</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013-2019 - The Bisq developers</string>
<string>Copyright © 2013-2020 - The Bisq developers</string>
<!-- Only supported in older OSX versions.
See: https://github.com/bitcoin/bitcoin/issues/11896#issuecomment-352148399-->

2
desktop/package/macosx/create_app.sh
View file

@ -6,7 +6,7 @@ mkdir -p deploy
set -e
version="1.3.4-SNAPSHOT"
version="1.3.5-SNAPSHOT"
cd ..
./gradlew :desktop:build -x test shadowJar

2
desktop/package/macosx/finalize.sh
View file

@ -2,7 +2,7 @@
cd ../../
version="1.3.4-SNAPSHOT"
version="1.3.5-SNAPSHOT"
target_dir="releases/$version"

2
desktop/package/macosx/insert_snapshot_version.sh
View file

@ -2,7 +2,7 @@
cd $(dirname $0)/../../../
version=1.3.4
version=1.3.5
find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \

4
desktop/package/macosx/replace_version_number.sh
View file

@ -2,8 +2,8 @@
cd $(dirname $0)/../../../
oldVersion=1.3.3
newVersion=1.3.4
oldVersion=1.3.4
newVersion=1.3.5
find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \

2
desktop/package/windows/package.bat
View file

@ -11,7 +11,7 @@
@echo off
set version=1.3.4-SNAPSHOT
set version=1.3.5-SNAPSHOT
if not exist "%JAVA_HOME%\bin\javapackager.exe" (
if not exist "%ProgramFiles%\Java\jdk-10.0.2" (
echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.

2
desktop/package/windows/release.bat
View file

@ -6,7 +6,7 @@
@echo off
set version=1.3.4-SNAPSHOT
set version=1.3.5-SNAPSHOT
set release_dir=%~dp0..\..\..\releases\%version%
set package_dir=%~dp0..

10
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View file

@ -812,14 +812,16 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
// We want to trigger a recalculation of the volume and minAmount
UserThread.execute(() -> {
onFocusOutVolumeTextField(true, false);
// do not update BTC Amount or minAmount here
// issue 2798: "after a few edits of offer the BTC amount has increased"
// intentionally removed: onFocusOutAmountTextField(true, false);
// intentionally removed: onFocusOutMinAmountTextField(true, false);
triggerFocusOutOnAmountFields();
});
}
}
public void triggerFocusOutOnAmountFields() {
onFocusOutAmountTextField(true, false);
onFocusOutMinAmountTextField(true, false);
}
public void onFocusOutPriceAsPercentageTextField(boolean oldValue, boolean newValue) {
inputIsMarketBasedPrice = !oldValue && newValue;
if (oldValue && !newValue) {

8
desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java
View file

@ -30,8 +30,8 @@ import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.offer.OpenOffer;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.user.Preferences;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
import bisq.common.handlers.ErrorMessageHandler;
@ -108,4 +108,10 @@ class EditOfferViewModel extends MutableOfferViewModel<EditOfferDataModel> {
public boolean isSecurityDepositValid() {
return securityDepositValidator.validate(buyerSecurityDeposit.get()).isValid;
}
@Override
public void triggerFocusOutOnAmountFields() {
// do not update BTC Amount or minAmount here
// issue 2798: "after a few edits of offer the BTC amount has increased"
}
}

2
relay/src/main/resources/version.txt
View file

@ -1 +1 @@
1.3.4-SNAPSHOT
1.3.5-SNAPSHOT

2
seednode/src/main/java/bisq/seednode/SeedNodeMain.java
View file

@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SeedNodeMain extends ExecutableForAppWithP2p {
private static final String VERSION = "1.3.4";
private static final String VERSION = "1.3.5";
private SeedNode seedNode;
public SeedNodeMain() {