Merge branch 'master' into forward-broadast-msg

bisq-network · Apr 16, 2019 · 51f9394 · 51f9394
2 parents 188f3ee + 60826a1
commit 51f9394
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -271,7 +271,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.0.0'
+    version = '1.0.0-SNAPSHOT'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

diff --git a/desktop/package/linux/Dockerfile b/desktop/package/linux/Dockerfile
@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 1.0.0
+ENV version 1.0.0-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

diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh
@@ -6,7 +6,7 @@
 #   - Update version below
 #   - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
 
-version=1.0.0
+version=1.0.0-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

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

diff --git a/desktop/package/macosx/create_app.sh b/desktop/package/macosx/create_app.sh
@@ -6,7 +6,7 @@ mkdir -p deploy
 
 set -e
 
-version="1.0.0"
+version="1.0.0-SNAPSHOT"
 
 cd ..
 ./gradlew :desktop:build -x test shadowJar

diff --git a/desktop/package/macosx/finalize.sh b/desktop/package/macosx/finalize.sh
@@ -2,7 +2,7 @@
 
 cd ../../
 
-version="1.0.0"
+version="1.0.0-SNAPSHOT"
 
 target_dir="releases/$version"
 

diff --git a/desktop/package/windows/package.bat b/desktop/package/windows/package.bat
@@ -8,7 +8,7 @@
 
 @echo off
 
-set version=1.0.0
+set version=1.0.0-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.

diff --git a/desktop/package/windows/release.bat b/desktop/package/windows/release.bat
@@ -6,7 +6,7 @@
 
 @echo off
 
-set version=1.0.0
+set version=1.0.0-SNAPSHOT
 set release_dir=%~dp0..\..\..\releases\%version%
 set package_dir=%~dp0..
 

diff --git a/relay/src/main/resources/version.txt b/relay/src/main/resources/version.txt
@@ -1 +1 @@
-1.0.0
+1.0.0-SNAPSHOT
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ mkdir -p deploy @@
     set -e
-    version="1.0.0"
+    version="1.0.0-SNAPSHOT"
     cd ..
     ./gradlew :desktop:build -x test shadowJar
@@ Expand Down @@