diff --git a/build.gradle b/build.gradle index b5a0b9f091..08bae2d15e 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,12 @@ sourceCompatibility = 1.8 mainClassName = 'bisq.desktop.app.BisqAppMain' +jar { + manifest.attributes( + 'Class-Path': 'bcpg-jdk15on-1.56.jar bcprov-jdk15on-1.56.jar' + ) +} + tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh index af57b35c48..4bd665b34e 100644 --- a/package/linux/32bitBuild.sh +++ b/package/linux/32bitBuild.sh @@ -26,6 +26,8 @@ $JAVA_HOME/bin/javapackager \ -vendor Bisq \ -outdir deploy \ -srcfiles "$dir/Bisq-$version.jar" \ + -srcfiles "$dir/bcpg-jdk15on-1.56.jar" \ + -srcfiles "$dir/bcprov-jdk15on-1.56.jar" \ -srcfiles package/linux/LICENSE \ -appclass bisq.desktop.app.BisqAppMain \ -BjvmOptions=-Xss1280k \ diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh index e239464366..553332701c 100644 --- a/package/linux/64bitBuild.sh +++ b/package/linux/64bitBuild.sh @@ -26,6 +26,8 @@ $JAVA_HOME/bin/javapackager \ -vendor Bisq \ -outdir deploy \ -srcfiles "$dir/Bisq-$version.jar" \ + -srcfiles "$dir/bcpg-jdk15on-1.56.jar" \ + -srcfiles "$dir/bcprov-jdk15on-1.56.jar" \ -srcfiles package/linux/LICENSE \ -appclass bisq.desktop.app.BisqAppMain \ -BjvmOptions=-Xss1280k \ diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh index 347afbb0b4..5c96a27bc8 100755 --- a/package/osx/create_app.sh +++ b/package/osx/create_app.sh @@ -28,6 +28,19 @@ cp $EXE_JAR "$linux64/Bisq-$version.jar" cp $EXE_JAR "$win32/Bisq.jar" cp $EXE_JAR "$win64/Bisq.jar" +# copy bouncycastle jars to VM shared folders +bc_lib1=bcpg-jdk15on-1.56.jar +cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1" +cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1" +cp build/app/lib/$bc_lib1 "$win32/$bc_lib1" +cp build/app/lib/$bc_lib1 "$win64/$bc_lib1" + +bc_lib2=bcprov-jdk15on-1.56.jar +cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2" +cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2" +cp build/app/lib/$bc_lib2 "$win32/$bc_lib2" +cp build/app/lib/$bc_lib2 "$win64/$bc_lib2" + # Copy packager scripts to VM. No need to checkout the source as we only are interested in the build scripts. mkdir -p "$linux32/package/linux" mkdir -p "$linux64/package/linux" @@ -58,6 +71,8 @@ $JAVA_HOME/bin/javapackager \ -vendor Bisq \ -outdir deploy \ -srcfiles "deploy/Bisq-$version.jar" \ + -srcfiles "deploy/$bc_lib1" \ + -srcfiles "deploy/$bc_lib2" \ -appclass bisq.desktop.app.BisqAppMain \ -outfile Bisq diff --git a/package/windows/32bitBuild.bat b/package/windows/32bitBuild.bat index 35e685481f..045a2cbb43 100644 --- a/package/windows/32bitBuild.bat +++ b/package/windows/32bitBuild.bat @@ -21,6 +21,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^ -outdir %outdir% ^ -appclass bisq.desktop.app.BisqAppMain ^ -srcfiles %outdir%\Bisq.jar ^ +-srcfiles %outdir%\bcpg-jdk15on-1.56.jar ^ +-srcfiles %outdir%\bcprov-jdk15on-1.56.jar ^ -outfile Bisq ^ -Bruntime="%JAVA_HOME%\jre" diff --git a/package/windows/64bitBuild.bat b/package/windows/64bitBuild.bat index 0e0a325f17..13f391deec 100644 --- a/package/windows/64bitBuild.bat +++ b/package/windows/64bitBuild.bat @@ -21,6 +21,8 @@ call "%JAVA_HOME%\bin\javapackager.exe" -deploy ^ -outdir %outdir% ^ -appclass bisq.desktop.app.BisqAppMain ^ -srcfiles %outdir%\Bisq.jar ^ +-srcfiles %outdir%\bcpg-jdk15on-1.56.jar ^ +-srcfiles %outdir%\bcprov-jdk15on-1.56.jar ^ -outfile Bisq ^ -Bruntime="%JAVA_HOME%\jre"