diff --git a/README.md b/README.md index 81ae481ce7..1f59c24aeb 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Staying in Touch Contact the team and keep up to date using any of the following: - The [Bisq website](https://bisq.network) - - GitHub [Issues](https://github.com/bisq-network/exchange/issues) + - GitHub [Issues](https://github.com/bisq-network/bisq-desktop/issues) - The [Bisq forum]( https://bisq.community) - The [#bisq](https://webchat.freenode.net/?channels=bisq) IRC channel on Freenode - Our [contributor mailing list](https://lists.bisq.network/listinfo/bisq-contrib) diff --git a/build.gradle b/build.gradle index 45fcfc862d..493d15fa0f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ apply plugin: 'witness' apply plugin: 'com.github.johnrengelman.shadow' group = 'network.bisq' -version = '0.7.0-SNAPSHOT' +version = '0.7.1-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index 4fd962c6ac..5ccbd8b53f 100644 --- a/package/linux/32bitBuild.sh +++ b/package/linux/32bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e # Edit version -version=0.7.0 +version=0.7.1 dir="/media/sf_vm_shared_ubuntu14_32bit" diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index d987527e74..43b260ddcd 100644 --- a/package/linux/64bitBuild.sh +++ b/package/linux/64bitBuild.sh @@ -6,7 +6,7 @@ mkdir -p deploy set -e # Edit version -version=0.7.0 +version=0.7.1 dir="/media/sf_vm_shared_ubuntu" diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index be101aeed8..cf80e3c12c 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -8,7 +8,7 @@ # pull base image FROM openjdk:8-jdk -ENV version 0.7.0 +ENV version 0.7.1 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* && apt-get install -y vim fakeroot diff --git a/package/linux/rpm.sh b/package/linux/rpm.sh index e311d1dcf6..4260517a6e 100644 --- a/package/linux/rpm.sh +++ b/package/linux/rpm.sh @@ -2,7 +2,7 @@ ## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261 -version=0.7.0 +version=0.7.1 alien -r -g /home/$USER/Desktop/Bisq-64bit-$version.deb find bisq-$version -type f | while read LIB; do LDDOUT=$(ldd $LIB 2>&1); LDDRETVAL=$?;if [ \( -z "${LDDOUT%%*you do not have execution permission for*}" \) -a \( $LDDRETVAL -eq 0 \) ]; then chmod -v +x $LIB;fi;done diff --git a/package/osx/Info.plist b/package/osx/Info.plist index f983c0ce37..45dfa4ca1b 100644 --- a/package/osx/Info.plist +++ b/package/osx/Info.plist @@ -15,7 +15,7 @@ CFBundleName Bisq CFBundleIdentifier - io.bisq.Bisq + io.bisq.CAT CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -40,7 +40,7 @@ JVMAppClasspath JVMMainJarName - Bisq-0.7.0.jar + Bisq-0.7.1.jar JVMPreferencesID bisq JVMOptions diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index 4bf926a52e..0d1c6c1bbb 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -6,11 +6,11 @@ mkdir -p deploy set -e -version="0.7.0" +version="0.7.1" ./gradlew --include-build ../common --include-build ../assets --include-build ../p2p --include-build ../core build -x test shadowJar -EXE_JAR=build/libs/bisq-desktop-0.7.0-all.jar +EXE_JAR=build/libs/bisq-desktop-$version-all.jar echo SHA 256 before stripping jar file: shasum -a256 $EXE_JAR | awk '{print $1}' @@ -40,17 +40,17 @@ cp $EXE_JAR "$win32/Bisq.jar" cp $EXE_JAR "$win64/Bisq.jar" # copy bouncycastle jars to VM shared folders -bc_lib1=bcpg-jdk15on-1.56.jar -cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1" -cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1" -cp build/app/lib/$bc_lib1 "$win32/$bc_lib1" -cp build/app/lib/$bc_lib1 "$win64/$bc_lib1" +# bc_lib1=bcpg-jdk15on-1.56.jar +# cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1" +# cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1" +# cp build/app/lib/$bc_lib1 "$win32/$bc_lib1" +# cp build/app/lib/$bc_lib1 "$win64/$bc_lib1" -bc_lib2=bcprov-jdk15on-1.56.jar -cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2" -cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2" -cp build/app/lib/$bc_lib2 "$win32/$bc_lib2" -cp build/app/lib/$bc_lib2 "$win64/$bc_lib2" +# bc_lib2=bcprov-jdk15on-1.56.jar +# cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2" +# cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2" +# cp build/app/lib/$bc_lib2 "$win32/$bc_lib2" +# cp build/app/lib/$bc_lib2 "$win64/$bc_lib2" # Copy packager scripts to VM. No need to checkout the source as we only are interested in the build scripts. rm -rf "$linux32/package" @@ -77,7 +77,7 @@ echo "Using JAVA_HOME: $JAVA_HOME" $JAVA_HOME/bin/javapackager \ -deploy \ -BappVersion=$version \ - -Bmac.CFBundleIdentifier=io.bisq \ + -Bmac.CFBundleIdentifier=io.bisq.CAT \ -Bmac.CFBundleName=Bisq \ -Bicon=package/osx/Bisq.icns \ -Bruntime="$JAVA_HOME/jre" \ diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh index 98c0fe9a27..60ff6ca268 100755 --- a/package/osx/finalize.sh +++ b/package/osx/finalize.sh @@ -2,7 +2,7 @@ cd ../../ -version="0.7.0" +version="0.7.1" target_dir="releases/$version" diff --git a/package/signingkey.asc b/package/signingkey.asc index 49c9449491..0e9920d475 100644 --- a/package/signingkey.asc +++ b/package/signingkey.asc @@ -1 +1 @@ -F379A1C6 \ No newline at end of file +29CDFD3B \ No newline at end of file diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat index 0b56ac0d42..87636dbc7c 100644 --- a/package/windows/32bitBuild.bat +++ b/package/windows/32bitBuild.bat @@ -5,7 +5,7 @@ :: 32 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.7.0 +SET version=0.7.1 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows_32bit diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat index 986d3a1ed5..3d6e2afa97 100644 --- a/package/windows/64bitBuild.bat +++ b/package/windows/64bitBuild.bat @@ -5,7 +5,7 @@ :: 64 bit build :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) -SET version=0.7.0 +SET version=0.7.1 :: Private setup SET outdir=\\VBOXSVR\vm_shared_windows diff --git a/package/windows/Bisq.iss b/package/windows/Bisq.iss index 9f09e408df..6bf8474604 100755 --- a/package/windows/Bisq.iss +++ b/package/windows/Bisq.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bisq}} AppName=Bisq -AppVersion=0.7.0 +AppVersion=0.7.1 AppVerName=Bisq AppPublisher=Bisq AppComments=Bisq diff --git a/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index 2a34821d03..d6800db42d 100644 --- a/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -255,7 +255,7 @@ public class OfferBookView extends ActivatableViewAndModel nrOfOffersLabel.setText(Res.get("offerbook.nrOffers", model.getOfferList().size())); // Fixes incorrect ordering of Available offers: - // https://github.com/bisq-network/exchange/issues/588 + // https://github.com/bisq-network/bisq-desktop/issues/588 priceFeedUpdateCounterListener = (observable, oldValue, newValue) -> tableView.sort(); } diff --git a/src/main/java/bisq/desktop/main/overlays/Overlay.java b/src/main/java/bisq/desktop/main/overlays/Overlay.java index 67b63308e1..1b7fcd35f6 100644 --- a/src/main/java/bisq/desktop/main/overlays/Overlay.java +++ b/src/main/java/bisq/desktop/main/overlays/Overlay.java @@ -360,7 +360,7 @@ public abstract class Overlay { public T useReportBugButton() { this.closeButtonText = Res.get("shared.reportBug"); - this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues")); + this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues")); //noinspection unchecked return (T) this; } @@ -779,7 +779,7 @@ public abstract class Overlay { gitHubButton.setOnAction(event -> { if (message != null) Utilities.copyToClipboard(message); - GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues"); + GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues"); hide(); }); } diff --git a/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java b/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java index 2e6f9dbc80..b75ceeb2fb 100644 --- a/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -20,7 +20,6 @@ package bisq.desktop.main.portfolio.pendingtrades; import bisq.desktop.common.model.ActivatableWithDataModel; import bisq.desktop.common.model.ViewModel; import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.validation.BtcAddressValidator; import bisq.core.locale.Res; import bisq.core.network.MessageState; @@ -32,6 +31,7 @@ import bisq.core.trade.Trade; import bisq.core.trade.closed.ClosedTradableManager; import bisq.core.util.BSFormatter; import bisq.core.util.BsqFormatter; +import bisq.core.util.validation.BtcAddressValidator; import bisq.network.p2p.P2PService; diff --git a/src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java b/src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java deleted file mode 100644 index d08d77636b..0000000000 --- a/src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file is part of Bisq. - * - * Bisq is free software: you can redistribute it and/or modify it - * under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or (at - * your option) any later version. - * - * Bisq is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public - * License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Bisq. If not, see . - */ - -package bisq.desktop.util.validation; - -import bisq.core.app.BisqEnvironment; -import bisq.core.locale.Res; -import bisq.core.util.validation.InputValidator; - -import org.bitcoinj.core.Address; -import org.bitcoinj.core.AddressFormatException; - -import javax.inject.Inject; - -public final class BtcAddressValidator extends InputValidator { - - @Inject - public BtcAddressValidator() { - } - - @Override - public ValidationResult validate(String input) { - - ValidationResult result = validateIfNotEmpty(input); - if (result.isValid) - return validateBtcAddress(input); - else - return result; - } - - private ValidationResult validateBtcAddress(String input) { - try { - Address.fromBase58(BisqEnvironment.getParameters(), input); - return new ValidationResult(true); - } catch (AddressFormatException e) { - return new ValidationResult(false, Res.get("validation.btc.invalidFormat")); - } - } -}