mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-22 22:45:21 +01:00
Prepare for custom binary:
- Set version 0.8.0 - Use Bisq_notifications as app name - Improve Relay - Fix build issues
This commit is contained in:
parent
4ce22ece97
commit
4a0c8b6dc1
11 changed files with 22 additions and 20 deletions
14
build.gradle
14
build.gradle
|
@ -1,5 +1,6 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
|
@ -15,7 +16,7 @@ apply plugin: 'witness'
|
|||
apply plugin: 'com.github.johnrengelman.shadow'
|
||||
|
||||
group = 'network.bisq'
|
||||
version = '0.7.1-SNAPSHOT'
|
||||
version = '0.8.0'
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
|
||||
|
@ -33,6 +34,7 @@ tasks.withType(JavaCompile) {
|
|||
sourceSets.main.resources.srcDirs += ['src/main/java'] // to copy fxml and css files
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://jitpack.io' }
|
||||
maven { url 'https://raw.githubusercontent.com/JesusMcCloud/tor-binary/master/release/' }
|
||||
|
@ -40,9 +42,9 @@ repositories {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile 'network.bisq:bisq-p2p:-SNAPSHOT'
|
||||
compile 'network.bisq:bisq-core:-SNAPSHOT'
|
||||
compile 'network.bisq:bisq-common:-SNAPSHOT'
|
||||
compile 'network.bisq:bisq-p2p:0.8.0'
|
||||
compile 'network.bisq:bisq-core:0.8.0'
|
||||
compile 'network.bisq:bisq-common:0.8.0'
|
||||
compile 'org.controlsfx:controlsfx:8.0.6_20'
|
||||
compile 'org.reactfx:reactfx:2.0-M3'
|
||||
compile 'net.glxn:qrgen:1.3'
|
||||
|
@ -54,7 +56,7 @@ dependencies {
|
|||
|
||||
|
||||
compileOnly 'org.projectlombok:lombok:1.16.16'
|
||||
annotationProcessor 'org.projectlombok:lombok:1.16.16'
|
||||
//annotationProcessor 'org.projectlombok:lombok:1.16.16'
|
||||
testCompile('org.mockito:mockito-core:2.8.9') {
|
||||
exclude(module: 'objenesis')
|
||||
}
|
||||
|
@ -64,7 +66,7 @@ dependencies {
|
|||
testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
|
||||
testCompile 'com.natpryce:make-it-easy:4.0.1'
|
||||
testCompileOnly 'org.projectlombok:lombok:1.16.16'
|
||||
testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
|
||||
//testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
|
||||
}
|
||||
|
||||
build.dependsOn installDist
|
||||
|
|
|
@ -6,7 +6,7 @@ mkdir -p deploy
|
|||
set -e
|
||||
|
||||
# Edit version
|
||||
version=0.7.1
|
||||
version=0.8.0
|
||||
|
||||
dir="/media/sf_vm_shared_ubuntu14_32bit"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ mkdir -p deploy
|
|||
set -e
|
||||
|
||||
# Edit version
|
||||
version=0.7.1
|
||||
version=0.8.0
|
||||
|
||||
dir="/media/sf_vm_shared_ubuntu"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
# pull base image
|
||||
FROM openjdk:8-jdk
|
||||
ENV version 0.7.1
|
||||
ENV version 0.8.0
|
||||
|
||||
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,7 +2,7 @@
|
|||
|
||||
## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261
|
||||
|
||||
version=0.7.1
|
||||
version=0.8.0
|
||||
|
||||
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
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<key>JVMAppClasspath</key>
|
||||
<string></string>
|
||||
<key>JVMMainJarName</key>
|
||||
<string>Bisq-0.7.1.jar</string>
|
||||
<string>Bisq-0.8.0.jar</string>
|
||||
<key>JVMPreferencesID</key>
|
||||
<string>bisq</string>
|
||||
<key>JVMOptions</key>
|
||||
|
|
|
@ -6,7 +6,7 @@ mkdir -p deploy
|
|||
|
||||
set -e
|
||||
|
||||
version="0.7.1"
|
||||
version="0.8.0"
|
||||
|
||||
./gradlew --include-build ../common --include-build ../assets --include-build ../p2p --include-build ../core build -x test shadowJar
|
||||
|
||||
|
@ -82,18 +82,18 @@ $JAVA_HOME/bin/javapackager \
|
|||
-Bicon=package/osx/Bisq.icns \
|
||||
-Bruntime="$JAVA_HOME/jre" \
|
||||
-native dmg \
|
||||
-name Bisq \
|
||||
-title Bisq \
|
||||
-name Bisq_notifications \
|
||||
-title Bisq_notifications \
|
||||
-vendor Bisq \
|
||||
-outdir deploy \
|
||||
-srcfiles "deploy/Bisq-$version.jar" \
|
||||
-appclass bisq.desktop.app.BisqAppMain \
|
||||
-outfile Bisq
|
||||
-outfile Bisq_notifications
|
||||
|
||||
rm "deploy/Bisq.html"
|
||||
rm "deploy/Bisq.jnlp"
|
||||
|
||||
mv "deploy/bundles/Bisq-$version.dmg" "deploy/Bisq-$version.dmg"
|
||||
mv "deploy/bundles/Bisq_notifications-$version.dmg" "deploy/Bisq_notifications-$version.dmg"
|
||||
rm -r "deploy/bundles"
|
||||
|
||||
open deploy
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
cd ../../
|
||||
|
||||
version="0.7.1"
|
||||
version="0.8.0"
|
||||
|
||||
target_dir="releases/$version"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
:: 32 bit build
|
||||
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
|
||||
|
||||
SET version=0.7.1
|
||||
SET version=0.8.0
|
||||
|
||||
:: Private setup
|
||||
SET outdir=\\VBOXSVR\vm_shared_windows_32bit
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
:: 64 bit build
|
||||
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
|
||||
|
||||
SET version=0.7.1
|
||||
SET version=0.8.0
|
||||
|
||||
:: Private setup
|
||||
SET outdir=\\VBOXSVR\vm_shared_windows
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
[Setup]
|
||||
AppId={{bisq}}
|
||||
AppName=Bisq
|
||||
AppVersion=0.7.1
|
||||
AppVersion=0.8.0
|
||||
AppVerName=Bisq
|
||||
AppPublisher=Bisq
|
||||
AppComments=Bisq
|
||||
|
|
Loading…
Add table
Reference in a new issue