Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/v1.3.2 #4175

Merged
merged 14 commits into from Apr 16, 2020
Merged

Release/v1.3.2 #4175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
782921e
Bump version number for v1.3.2
ripcurlx Apr 10, 2020
77835b9
Add shortcut to move failed trade to pending trades
sqrrm Dec 17, 2019
c889fbd
Reattach addresses when unfailing trade
sqrrm Apr 10, 2020
e739f94
Don't unfail if deposit or delayedpayout txs are missing
sqrrm Apr 10, 2020
efee2e4
Init unfailed trade when moved to pending trades
sqrrm Apr 11, 2020
016a552
Allow completion of trades with amount mismatch delayed tx
sqrrm Apr 12, 2020
6fc087c
Add option to allow faulty delay payout tx
sqrrm Apr 12, 2020
1a1f71a
Change command line argument default
sqrrm Apr 12, 2020
be09682
Replace mock arg with SEPA PaymentMethod instance
ghubstan Apr 11, 2020
9ce26e6
Update data stores for v1.3.2
ripcurlx Apr 14, 2020
cfc4705
Update translations for v1.3.2
ripcurlx Apr 14, 2020
26f30b6
Add second donation address as valid
sqrrm Apr 15, 2020
dc692f5
Merge pull request #4173 from sqrrm/add-donation-address
ripcurlx Apr 15, 2020
1105a78
Revert to SNAPSHOT version
ripcurlx Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Expand Up @@ -367,7 +367,7 @@ configure(project(':desktop')) {
apply plugin: 'witness'
apply from: '../gradle/witness/gradle-witness.gradle'

version = '1.3.2'
version = '1.3.2-SNAPSHOT'

mainClassName = 'bisq.desktop.app.BisqAppMain'

Expand Down
2 changes: 1 addition & 1 deletion desktop/package/linux/Dockerfile
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@

# pull base image
FROM openjdk:8-jdk
ENV version 1.3.2
ENV version 1.3.2-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
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/linux/package.sh
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
# - Update version below
# - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory

version=1.3.2
version=1.3.2-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
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/linux/release.sh
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
# Prior to running this script:
# - Update version below

version=1.3.2
version=1.3.2-SNAPSHOT
base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
package_dir=$base_dir/desktop/package
release_dir=$base_dir/desktop/release/$version
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/create_app.sh
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ mkdir -p deploy

set -e

version="1.3.2"
version="1.3.2-SNAPSHOT"

cd ..
./gradlew :desktop:build -x test shadowJar
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/finalize.sh
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

cd ../../

version="1.3.2"
version="1.3.2-SNAPSHOT"

target_dir="releases/$version"

Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/insert_snapshot_version.sh
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

cd $(dirname $0)/../../../

version=1.3.1
version=1.3.2

find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/windows/package.bat
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@

@echo off

set version=1.3.2
set version=1.3.2-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.
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/windows/release.bat
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

@echo off

set version=1.3.2
set version=1.3.2-SNAPSHOT
set release_dir=%~dp0..\..\..\releases\%version%
set package_dir=%~dp0..

Expand Down
2 changes: 1 addition & 1 deletion relay/src/main/resources/version.txt
View file
Open in desktop
@@ -1 +1 @@
1.3.2
1.3.2-SNAPSHOT