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

Merge pull request #3313 from bisq-network/hotfix/v1.1.6

Browse source 
Hotfix branch (v1.1.7)
This commit is contained in:
Christoph Atteneder 2019-09-23 11:06:31 +02:00 • committed by GitHub
commit e90856e97d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -274,7 +274,7 @@ configure(project(':desktop')) {
apply plugin: 'witness'
apply from: '../gradle/witness/gradle-witness.gradle'
version = '1.1.6-SNAPSHOT'
version = '1.1.7-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.1.6";
public static final String VERSION = "1.1.7";
public static int getMajorVersion(String version) {
return getSubVersion(version, 0);

2
core/src/main/resources/i18n/displayStrings.properties
View file

@ -2203,7 +2203,7 @@ Summary:\n\
Payout amount for BTC buyer: {1}\n\
Payout amount for BTC seller: {2}\n\n\
Summary notes:\n{3}
disputeSummaryWindow.close.nextStepsForMediation=\n\nNext steps:\n
disputeSummaryWindow.close.nextStepsForMediation=\n\nNext steps:\n\
Open ongoing trade and accept or reject the suggested mediation
disputeSummaryWindow.close.closePeer=You need to close also the trading peers ticket!

2
desktop/package/linux/Dockerfile
View file

@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
ENV version 1.1.6-SNAPSHOT
ENV version 1.1.7-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.1.6-SNAPSHOT
version=1.1.7-SNAPSHOT
if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then
JAVA_HOME=/usr/lib/jvm/jdk-10.0.2

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

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

4
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.1.6</string>
<string>1.1.7</string>
<key>CFBundleShortVersionString</key>
<string>1.1.6</string>
<string>1.1.7</string>
<key>CFBundleExecutable</key>
<string>Bisq</string>

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

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

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

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

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

@ -2,7 +2,7 @@
cd $(dirname $0)/../../../
version=1.1.6
version=1.1.7
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.1.5
newVersion=1.1.6
oldVersion=1.1.6
newVersion=1.1.7
find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \

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

@ -8,7 +8,7 @@
@echo off
set version=1.1.6-SNAPSHOT
set version=1.1.7-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.1.6-SNAPSHOT
set version=1.1.7-SNAPSHOT
set release_dir=%~dp0..\..\..\releases\%version%
set package_dir=%~dp0..

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

@ -1 +1 @@
1.1.6-SNAPSHOT
1.1.7-SNAPSHOT

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

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