mirror of
https://github.com/bisq-network/bisq.git
synced 2025-01-19 05:44:05 +01:00
Merge branch 'master' into updatetechdocs
This commit is contained in:
BtcContributor
GitHub
commit
734faad8aa
4
Makefile
4
Makefile
@ -14,8 +14,8 @@
|
||||
#
|
||||
# - Linux, macOS or similar *nix with standard tools like `make`
|
||||
# - bitcoind and bitcoin-cli (`brew install bitcoin` on macOS)
|
||||
# - JDK 10 to build and run Bisq binaries; see
|
||||
# https://www.oracle.com/java/technologies/java-archive-javase10-downloads.html
|
||||
# - JDK 11 to build and run Bisq binaries; see
|
||||
# https://jdk.java.net/archive/
|
||||
#
|
||||
#
|
||||
# USAGE
|
||||
|
||||
@ -176,8 +176,12 @@ public class OptionParsersTest {
|
||||
};
|
||||
Throwable exception = assertThrows(RuntimeException.class, () ->
|
||||
new CreatePaymentAcctOptionParser(args).parse());
|
||||
assertEquals("json payment account form '/tmp/milkyway/solarsystem/mars' could not be found",
|
||||
if (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)
|
||||
assertEquals("json payment account form '\\tmp\\milkyway\\solarsystem\\mars' could not be found",
|
||||
exception.getMessage());
|
||||
else
|
||||
assertEquals("json payment account form '/tmp/milkyway/solarsystem/mars' could not be found",
|
||||
exception.getMessage());
|
||||
}
|
||||
|
||||
// createcryptopaymentacct parser tests
|
||||
|
||||
@ -595,8 +595,10 @@ portfolio.pending.invalidTx=There is an issue with a missing or invalid transact
|
||||
Error message: {0}
|
||||
|
||||
portfolio.pending.unconfirmedTooLong=Security deposit transaction on trade {0} is still unconfirmed after {1} hours. \
|
||||
Check the deposit transaction at a blockchain explorer. If it has been confirmed but it's not being displayed \
|
||||
at Bisq, make a data backup and a SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\n\
|
||||
Check the deposit transaction at a blockchain explorer; if it has been confirmed but is not being displayed \
|
||||
as confirmed in Bisq: \n\
|
||||
● Make a data backup [HYPERLINK:https://bisq.wiki/Backing_up_application_data] \n\
|
||||
● Do an SPV resync. [HYPERLINK:https://bisq.wiki/Resyncing_SPV_file]\n\n\
|
||||
Contact Bisq support [HYPERLINK:https://keybase.io/team/bisq] if you have doubts or the issue persists.
|
||||
|
||||
portfolio.pending.step1.waitForConf=Wait for blockchain confirmation
|
||||
@ -2954,8 +2956,8 @@ popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\n
|
||||
|
||||
popup.attention.forTradeWithId=Attention required for trade with ID {0}
|
||||
popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers \
|
||||
by right-clicking on an existing offer or trade and choosing `Create new offer like this`. This is useful for \
|
||||
traders who frequently make the same offer.
|
||||
by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. \
|
||||
This is useful for traders who frequently make the same offer.
|
||||
|
||||
popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available
|
||||
popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one.
|
||||
|
||||
@ -45,14 +45,14 @@
|
||||
|
||||
1. You do _not_ need to install Gradle to build Bisq. The `gradlew` shell script will install it for you, if necessary.
|
||||
|
||||
2. Bisq currently works with JDK 10 and 11 only. JDK 12 and above are not supported. You can find out which
|
||||
2. Bisq currently works with JDK 11 only. JDK 12 and above are not supported. You can find out which
|
||||
version you have with:
|
||||
|
||||
```sh
|
||||
javac -version
|
||||
```
|
||||
|
||||
If your Java version is not 10 or 11, check out scripts in the [scripts](../scripts) directory (or online at https://github.com/bisq-network/bisq/tree/master/scripts).
|
||||
If you do not have JDK 11 installed, check out scripts in the [scripts](../scripts) directory or download it manually from https://jdk.java.net/archive/.
|
||||
|
||||
## Running Bisq
|
||||
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
Most Bisq contributors use IDEA for development. The following instructions have been tested on IDEA 2021.1.
|
||||
|
||||
1. Follow the instructions in [build.md](build.md) to clone and build Bisq at the command line.
|
||||
1. Open IDEA
|
||||
1. Go to `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors` and check the `Enable annotation processing` option to enable processing of Lombok annotations (Lombok plugin installed by default since v2020.3)
|
||||
1. Go to `File -> New -> Project from Existing Sources...` and then select the main Bisq folder to load automatically the related Gradle project
|
||||
1. If you did not yet setup JDK11 in IntelliJ, go to `File-> Project Structure -> Project` and under the `Project SDK` option locate your JDK11 folder
|
||||
1. Select JDK 11 for Gradle as well. Go to `File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` and select the JDK11 location for the Gradle JVM value
|
||||
1. Go to `Build -> Build Project`. Everything should build cleanly
|
||||
1. Go to `Run > Edit Configurations... -> Plus (+) icon on the top left -> Application` anf then fill the requested fields as shown below, while using as CLI arguments one of those listed in [dev-setup.md](dev-setup.md):
|
||||
1. Follow the instructions in [build.md](build.md) to clone and build Bisq at the command line.
|
||||
1. Open IDEA
|
||||
1. Go to `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors` and check the `Enable annotation processing` option to enable processing of Lombok annotations (Lombok plugin installed by default since v2020.3)
|
||||
1. Go to `File -> New -> Project from Existing Sources...` and then select the main Bisq folder to load automatically the related Gradle project
|
||||
1. If you did not yet setup JDK11 in IntelliJ, go to `File-> Project Structure -> Project` and under the `Project SDK` option locate your JDK11 folder
|
||||
1. Select JDK 11 for Gradle as well. Go to `File -> Settings -> Build, Execution, Deployment -> Build Tools -> Gradle` and select the JDK11 location for the Gradle JVM value
|
||||
1. Go to `Build -> Build Project`. Everything should build cleanly
|
||||
1. Go to `Run > Edit Configurations... -> Plus (+) icon on the top left -> Application` anf then fill the requested fields as shown below, while using as CLI arguments one of those listed in [dev-setup.md](dev-setup.md):
|
||||
|
||||
|
||||
|
||||
|
||||
@ -25,9 +25,9 @@ cd /D "%~dp0"
|
||||
|
||||
title Install Java
|
||||
|
||||
set jdk_version=10.0.2
|
||||
set jdk_version=11.0.2
|
||||
set jdk_filename=openjdk-%jdk_version%_windows-x64_bin
|
||||
set jdk_url=https://download.java.net/java/GA/jdk10/%jdk_version%/19aef61b38124481863b1413dce1855f/13/%jdk_filename%.tar.gz
|
||||
set jdk_url=https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip
|
||||
|
||||
if exist "%PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%" (
|
||||
echo %PROGRAMFILES%\Java\openjdk\jdk-%jdk_version% already exists, skipping install
|
||||
@ -35,26 +35,16 @@ if exist "%PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%" (
|
||||
)
|
||||
|
||||
echo Downloading required files to %TEMP%
|
||||
powershell -Command "Invoke-WebRequest %jdk_url% -OutFile $env:temp\%jdk_filename%.tar.gz"
|
||||
if not exist "%TEMP%\7za920\7za.exe" (
|
||||
:: Download 7zip ^(command line version^) in order to extract the tar.gz file since there is no native support in Windows
|
||||
powershell -Command "Invoke-WebRequest https://www.7-zip.org/a/7za920.zip -OutFile $env:temp\7za920.zip"
|
||||
powershell -Command "Expand-Archive $env:temp\7za920.zip -DestinationPath $env:temp\7za920 -Force"
|
||||
)
|
||||
powershell -Command "Invoke-WebRequest %jdk_url% -OutFile $env:temp\%jdk_filename%.zip"
|
||||
|
||||
echo Extracting and installing JDK to %PROGRAMFILES%\Java\openjdk\jdk-%jdk_version%
|
||||
"%TEMP%\7za920\7za.exe" x "%TEMP%\%jdk_filename%.tar.gz" -o"%TEMP%" -r -y
|
||||
"%TEMP%\7za920\7za.exe" x "%TEMP%\%jdk_filename%.tar" -o"%TEMP%\openjdk-%jdk_version%" -r -y
|
||||
powershell -Command "Expand-Archive $env:temp\%jdk_filename%.zip -DestinationPath %TEMP%\openjdk-%jdk_version% -Force"
|
||||
md "%PROGRAMFILES%\Java\openjdk"
|
||||
move "%TEMP%\openjdk-%jdk_version%\jdk-%jdk_version%" "%PROGRAMFILES%\Java\openjdk"
|
||||
|
||||
echo Removing downloaded files
|
||||
if exist "%TEMP%\7za920.zip" (
|
||||
del /Q %TEMP%\7za920.zip
|
||||
)
|
||||
rmdir /S /Q %TEMP%\openjdk-%jdk_version%
|
||||
del /Q %TEMP%\%jdk_filename%.tar
|
||||
del /Q %TEMP%\%jdk_filename%.tar.gz
|
||||
del /Q %TEMP%\%jdk_filename%.zip
|
||||
|
||||
:SetEnvVars
|
||||
echo Setting environment variables
|
||||
|
||||
@ -15,9 +15,9 @@ set -e
|
||||
unameOut="$(uname -s)"
|
||||
case "${unameOut}" in
|
||||
Linux*)
|
||||
JAVA_HOME=/usr/lib/jvm/openjdk-10.0.2
|
||||
JDK_FILENAME=openjdk-10.0.2_linux-x64_bin.tar.gz
|
||||
JDK_URL=https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz
|
||||
JAVA_HOME=/usr/lib/jvm/openjdk-11.0.2
|
||||
JDK_FILENAME=openjdk-11.0.2_linux-x64_bin.tar.gz
|
||||
JDK_URL=https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz
|
||||
|
||||
# Determine which package manager to use depending on the distribution
|
||||
declare -A osInfo;
|
||||
@ -52,13 +52,13 @@ case "${unameOut}" in
|
||||
update-alternatives --set javac $JAVA_HOME/bin/javac
|
||||
;;
|
||||
Darwin*)
|
||||
JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-10.0.2.jdk/Contents/Home
|
||||
JDK_FILENAME=openjdk-10.0.2_osx-x64_bin.tar.gz
|
||||
JDK_URL=https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_osx-x64_bin.tar.gz
|
||||
JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk-11.0.2.jdk/Contents/Home
|
||||
JDK_FILENAME=openjdk-11.0.2_osx-x64_bin.tar.gz
|
||||
JDK_URL=https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz
|
||||
if [ ! -d "$JAVA_HOME" ]; then
|
||||
if [[ $(command -v brew) == "" ]]; then
|
||||
echo "Installing Hombrew"
|
||||
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
|
||||
echo "Installing Homebrew"
|
||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||
else
|
||||
echo "Updating Homebrew"
|
||||
brew update
|
||||
@ -66,10 +66,10 @@ case "${unameOut}" in
|
||||
|
||||
brew install curl
|
||||
curl -L -O $JDK_URL
|
||||
sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-10.0.2.jdk | sudo bash
|
||||
sudo mkdir /Library/Java/JavaVirtualMachines/openjdk-11.0.2.jdk | sudo bash
|
||||
gunzip -c $JDK_FILENAME | tar xopf -
|
||||
sudo mv jdk-10.0.2.jdk/* /Library/Java/JavaVirtualMachines/openjdk-10.0.2.jdk
|
||||
sudo rmdir jdk-10.0.2.jdk
|
||||
sudo mv jdk-11.0.2.jdk/* /Library/Java/JavaVirtualMachines/openjdk-11.0.2.jdk
|
||||
sudo rmdir jdk-11.0.2.jdk
|
||||
rm $JDK_FILENAME
|
||||
fi
|
||||
|
||||
@ -80,4 +80,3 @@ case "${unameOut}" in
|
||||
*)
|
||||
esac
|
||||
java -version
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user