From e2ad0d190ad176084137cccaa285a64effe705fa Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 19 Mar 2022 17:52:01 -0400 Subject: [PATCH] Use both JNA jars --- build.sh | 5 +++-- src/app-profile/version.txt | 2 +- src/nsis/i2pbrowser-jpackage.nsi | 2 +- src/profile/version.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 740925c..1ef4171 100755 --- a/build.sh +++ b/build.sh @@ -53,12 +53,13 @@ echo "compiling custom launcher" mkdir build cp "$I2P_JARS"/*.jar build if [ ! -f "$HERE/build/jna.jar" ]; then - wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" + wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar" + wget -O "$HERE/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" fi cd java -"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/jna.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \ +"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \ net/i2p/router/Shell32X.java \ net/i2p/router/WinLauncher.java \ net/i2p/router/WindowsUpdatePostProcessor.java \ diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index 1c5c4af..1c6f4d4 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -1.06.1 +1.07.1 diff --git a/src/nsis/i2pbrowser-jpackage.nsi b/src/nsis/i2pbrowser-jpackage.nsi index d8024bb..88e7fae 100644 --- a/src/nsis/i2pbrowser-jpackage.nsi +++ b/src/nsis/i2pbrowser-jpackage.nsi @@ -1 +1 @@ -!define I2P_VERSION 1.6.1 +!define I2P_VERSION 1.7.0 diff --git a/src/profile/version.txt b/src/profile/version.txt index 1c5c4af..1c6f4d4 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -1.06.1 +1.07.1