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

[WIP] Release preparations for v0.7.0 #1528

Merged
merged 9 commits into from May 11, 2018
Merged

[WIP] Release preparations for v0.7.0 #1528

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a37df8e
Increase version number
ripcurlx May 1, 2018
7af493b
Use bundle identifier owned by @ripcurlx
ripcurlx May 1, 2018
0f26e18
Add workaround to be able to test creation of macOS bundle
ripcurlx May 1, 2018
41f6ce3
Update copyright
ripcurlx May 1, 2018
97f7d24
Merge remote-tracking branch 'origin/master' into release-preparation…
ripcurlx May 2, 2018
b4245fd
Adapt script for new release
ripcurlx May 2, 2018
fdc8d84
Adapt linux path of VM
ripcurlx May 2, 2018
dbd3d91
Merge remote-tracking branch 'origin/master' into release-preparation…
ripcurlx May 3, 2018
4a78010
Re-introduce fat executable jar for release packaging
cbeams May 6, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -26,3 +26,4 @@ build
desktop.ini
*/target/*
*.class
deploy
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
classpath files('gradle/witness/gradle-witness.jar')
}
}
Expand All @@ -12,6 +12,7 @@ apply plugin: 'java'
apply plugin: 'application'
apply plugin: 'maven'
apply plugin: 'witness'
apply plugin: 'com.github.johnrengelman.shadow'

group = 'network.bisq'
version = '-SNAPSHOT'
Expand Down
20 changes: 10 additions & 10 deletions package/osx/create_app.sh
View file
Open in desktop
@@ -1,13 +1,16 @@
#!/bin/bash

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

mkdir -p deploy

set -e

version="0.7.0"

./gradlew build
./gradlew shadowJar

EXE_JAR=build/libs/bisq-desktop--SNAPSHOT-all.jar

linux32=build/vm/vm_shared_ubuntu14_32bit
linux64=build/vm/vm_shared_ubuntu
Expand All @@ -16,17 +19,14 @@ win64=build/vm/vm_shared_windows

mkdir -p $linux32 $linux64 $win32 $win64

# temp copy
cp build/libs/bisq-desktop--SNAPSHOT.jar "build/libs/bisq-desktop.jar"

cp build/libs/bisq-desktop.jar "deploy/Bisq-$version.jar"
cp $EXE_JAR "deploy/Bisq-$version.jar"

# copy app jar to VM shared folders
cp build/libs/bisq-desktop.jar "$linux32/Bisq-$version.jar"
cp build/libs/bisq-desktop.jar "$linux64/Bisq-$version.jar"
cp $EXE_JAR "$linux32/Bisq-$version.jar"
cp $EXE_JAR "$linux64/Bisq-$version.jar"
# At windows we don't add the version nr as it would keep multiple versions of jar files in app dir
cp build/libs/bisq-desktop.jar "$win32/Bisq.jar"
cp build/libs/bisq-desktop.jar "$win64/Bisq.jar"
cp $EXE_JAR "$win32/Bisq.jar"
cp $EXE_JAR "$win64/Bisq.jar"

if [ -z "$JAVA_HOME" ]; then
JAVA_HOME=$(/usr/libexec/java_home)
Expand Down