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.

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

Release/v1.3.9 #4531

Merged
merged 5 commits into from
Sep 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ configure(project(':desktop')) {
apply plugin: 'witness'
apply from: '../gradle/witness/gradle-witness.gradle'

version = '1.3.8-SNAPSHOT'
version = '1.3.9-SNAPSHOT'

mainClassName = 'bisq.desktop.app.BisqAppMain'

Expand Down Expand Up @@ -497,7 +497,7 @@ configure(project(':pricenode')) {

test {
useJUnitPlatform()

// Disabled by default, since spot provider tests include connections to external API endpoints
// Can be enabled by adding -Dtest.pricenode.includeSpotProviderTests=true to the gradle command:
// ./gradlew test -Dtest.pricenode.includeSpotProviderTests=true
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/bisq/common/app/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.8";
public static final String VERSION = "1.3.9";

public static int getMajorVersion(String version) {
return getSubVersion(version, 0);
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# pull base image
FROM openjdk:8-jdk
ENV version 1.3.8-SNAPSHOT
ENV version 1.3.9-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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - Update version below
# - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory

version=1.3.8-SNAPSHOT
version=1.3.9-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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Prior to running this script:
# - Update version below

version=1.3.8-SNAPSHOT
version=1.3.9-SNAPSHOT
base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..
package_dir=$base_dir/desktop/package
release_dir=$base_dir/desktop/release/$version
Expand Down
4 changes: 2 additions & 2 deletions desktop/package/macosx/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<!-- See: https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -->

<key>CFBundleVersion</key>
<string>1.3.8</string>
<string>1.3.9</string>

<key>CFBundleShortVersionString</key>
<string>1.3.8</string>
<string>1.3.9</string>

<key>CFBundleExecutable</key>
<string>Bisq</string>
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/create_app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mkdir -p deploy

set -e

version="1.3.8-SNAPSHOT"
version="1.3.9-SNAPSHOT"

cd ..
./gradlew :desktop:build -x test shadowJar
Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/finalize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd ../../

version="1.3.8-SNAPSHOT"
version="1.3.9-SNAPSHOT"

target_dir="releases/$version"

Expand Down
2 changes: 1 addition & 1 deletion desktop/package/macosx/insert_snapshot_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

version=1.3.8
version=1.3.9

find . -type f \( -name "finalize.sh" \
-o -name "create_app.sh" \
Expand Down
4 changes: 2 additions & 2 deletions desktop/package/macosx/replace_version_number.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

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

oldVersion=1.3.7
newVersion=1.3.8
oldVersion=1.3.8
newVersion=1.3.9

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

@echo off

set version=1.3.8-SNAPSHOT
set version=1.3.9-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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@echo off

set version=1.3.8-SNAPSHOT
set version=1.3.9-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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.8-SNAPSHOT
1.3.9-SNAPSHOT
2 changes: 1 addition & 1 deletion seednode/src/main/java/bisq/seednode/SeedNodeMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

@Slf4j
public class SeedNodeMain extends ExecutableForAppWithP2p {
private static final String VERSION = "1.3.8";
private static final String VERSION = "1.3.9";
private SeedNode seedNode;

public SeedNodeMain() {
Expand Down