diff --git a/build.gradle b/build.gradle index 9bcf943..cf1a4b7 100644 --- a/build.gradle +++ b/build.gradle @@ -20,13 +20,12 @@ buildscript { repositories { jcenter() - maven { url "https://maven.google.com" } google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0-beta05' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.1' + classpath 'com.android.tools.build:gradle:3.6.0-beta03' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a951..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c..0ebb310 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index e95643d..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/library/build.gradle b/library/build.gradle index 03d196e..fd5fa3a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -43,15 +43,18 @@ android { } ext { - libtorrentVersion = '1.2.0.16' + libtorrentVersion = '1.2.2.0' } dependencies { - api "com.frostwire:jlibtorrent:$libtorrentVersion" - api "com.frostwire:jlibtorrent-android-arm:$libtorrentVersion" - api "com.frostwire:jlibtorrent-android-arm64:$libtorrentVersion" - api "com.frostwire:jlibtorrent-android-x86:$libtorrentVersion" - api "com.frostwire:jlibtorrent-android-x86_64:$libtorrentVersion" + // as the latest updates are not anymore on maven, we need to include the files here + // downloaded from https://github.com/frostwire/frostwire-jlibtorrent/releases + + api files("libs/jlibtorrent-${libtorrentVersion}.jar") + api files("libs/jlibtorrent-android-arm-${libtorrentVersion}.jar") + api files("libs/jlibtorrent-android-arm64-${libtorrentVersion}.jar") + api files("libs/jlibtorrent-android-x86-${libtorrentVersion}.jar") + api files("libs/jlibtorrent-android-x86_64-${libtorrentVersion}.jar") } bintray { diff --git a/library/libs/jlibtorrent-1.2.2.0.jar b/library/libs/jlibtorrent-1.2.2.0.jar new file mode 100644 index 0000000..48d3455 Binary files /dev/null and b/library/libs/jlibtorrent-1.2.2.0.jar differ diff --git a/library/libs/jlibtorrent-android-arm-1.2.2.0.jar b/library/libs/jlibtorrent-android-arm-1.2.2.0.jar new file mode 100644 index 0000000..0d44812 Binary files /dev/null and b/library/libs/jlibtorrent-android-arm-1.2.2.0.jar differ diff --git a/library/libs/jlibtorrent-android-arm64-1.2.2.0.jar b/library/libs/jlibtorrent-android-arm64-1.2.2.0.jar new file mode 100644 index 0000000..192e062 Binary files /dev/null and b/library/libs/jlibtorrent-android-arm64-1.2.2.0.jar differ diff --git a/library/libs/jlibtorrent-android-x86-1.2.2.0.jar b/library/libs/jlibtorrent-android-x86-1.2.2.0.jar new file mode 100644 index 0000000..481e695 Binary files /dev/null and b/library/libs/jlibtorrent-android-x86-1.2.2.0.jar differ diff --git a/library/libs/jlibtorrent-android-x86_64-1.2.2.0.jar b/library/libs/jlibtorrent-android-x86_64-1.2.2.0.jar new file mode 100644 index 0000000..3d18716 Binary files /dev/null and b/library/libs/jlibtorrent-android-x86_64-1.2.2.0.jar differ