diff --git a/build.gradle b/build.gradle index 4a808871..d7b62b86 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'java' group 'com.frostwire' archivesBaseName = 'jlibtorrent' // Just changing version here should be all that's necessary to bump the version on the library -version '1.2.15.2' +version '1.2.16.0' sourceCompatibility = '1.8' targetCompatibility = '1.8' diff --git a/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java b/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java index fe8d4bce..bc67d3d9 100644 --- a/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java +++ b/src/main/java/com/frostwire/jlibtorrent/swig/libtorrent_jni.java @@ -13,7 +13,7 @@ public class libtorrent_jni { public static String jlibtorrentVersion() { // extracted from the gradle with the run-swig step - return "1.2.15.2"; + return "1.2.16.0"; } public static boolean isMacOS() { diff --git a/swig/build-utils.shinc b/swig/build-utils.shinc index 721c5933..5acca136 100755 --- a/swig/build-utils.shinc +++ b/swig/build-utils.shinc @@ -57,9 +57,10 @@ export LIBRARY_NAME=jlibtorrent # In order to make sure a cherry-picked commit is checkout on the RC_1_2 branch # I create a tag for it on the github.com/gubatron/libtorrent/commits/RC_1_2 branch # The tag name format is 'RC_1_2_' + -export LIBTORRENT_REVISION=e22621a1883fb1a7ca416dc9aa134518e04f0644 # Clean up compile flags for msvc -export OPENSSL_VERSION="1.1.1m" -export BOOST_VERSION="78" +#export LIBTORRENT_REVISION=e22621a1883fb1a7ca416dc9aa134518e04f0644 # Clean up compile flags for msvc +export LIBTORRENT_REVISION=239500acf2bc60dcb91330bf3c21b939d9f603af # fix bdecode support for large strings (>= 100 MB) +export OPENSSL_VERSION="1.1.1n" +export BOOST_VERSION="79" export BOOST_MAJOR="1" export BOOST_MINOR="0" export BOOST_DOT_VERSION="${BOOST_MAJOR}.${BOOST_VERSION}.${BOOST_MINOR}" diff --git a/swig/libtorrent_jni.cpp b/swig/libtorrent_jni.cpp index f201309e..a8366951 100644 --- a/swig/libtorrent_jni.cpp +++ b/swig/libtorrent_jni.cpp @@ -23741,7 +23741,7 @@ SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_LIBT (void)jenv; (void)jcls; - result = (int)(15); + result = (int)(14); jresult = (jint)result; return jresult; } @@ -23753,7 +23753,7 @@ SWIGEXPORT jint JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_LIBT (void)jenv; (void)jcls; - result = (int)(((1*10000) +(2*100) +15)); + result = (int)(((1*10000) +(2*100) +14)); jresult = (jint)result; return jresult; } @@ -23765,7 +23765,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_L (void)jenv; (void)jcls; - result = (char *)("1.2.15.0"); + result = (char *)("1.2.14.0"); if (result) jresult = jenv->NewStringUTF((const char *)result); return jresult; } @@ -23777,7 +23777,7 @@ SWIGEXPORT jstring JNICALL Java_com_frostwire_jlibtorrent_swig_libtorrent_1jni_L (void)jenv; (void)jcls; - result = (char *)("0facda852"); + result = (char *)("2b4776a90"); if (result) jresult = jenv->NewStringUTF((const char *)result); return jresult; }