From 0e811ee7eb6e2ae8cf6617e9472f72984c774e10 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Wed, 16 Oct 2019 17:00:44 +0700 Subject: [PATCH 1/8] Update Rx2InternalNetworking.java -commit --- .../java/com/rx2androidnetworking/Rx2InternalNetworking.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java index e33afd36..f958d764 100644 --- a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java +++ b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java @@ -271,7 +271,7 @@ protected void subscribeActual(Observer observer) { try { final long startTime = System.currentTimeMillis(); final long startBytes = TrafficStats.getTotalRxBytes(); - okHttpResponse = request.getCall().execute(); + okHttpResponse = call.execute(); Utils.saveFile(okHttpResponse, request.getDirPath(), request.getFileName()); final long timeTaken = System.currentTimeMillis() - startTime; if (okHttpResponse.cacheResponse() == null) { From a7a918cf451e8ef4decc9930df9b092a6cf841f4 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Wed, 16 Oct 2019 17:13:27 +0700 Subject: [PATCH 2/8] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b5ef45fe..415d6e22 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' + classpath 'com.android.tools.build:gradle:3.3.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // NOTE: Do not place your application dependencies here; they belong @@ -60,4 +60,4 @@ ext { jUnitVersion = "4.12" mockWebServerVersion = "3.10.0" supportAppCompatVersion = "27.1.1" -} \ No newline at end of file +} From 574dcd2ca05581d07605bd9a174ad6526a9090d6 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Wed, 16 Oct 2019 17:18:00 +0700 Subject: [PATCH 3/8] Update build.gradle From 432a7730c7eafb9b5eda1985a81242fcbb6dcceb Mon Sep 17 00:00:00 2001 From: tamdragle Date: Wed, 16 Oct 2019 17:43:18 +0700 Subject: [PATCH 4/8] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 415d6e22..f0944269 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.1.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // NOTE: Do not place your application dependencies here; they belong From d6b55b1cb56130a3c6a630e32219d54455b3c6d2 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Wed, 16 Oct 2019 18:33:56 +0700 Subject: [PATCH 5/8] Update Rx2InternalNetworking.java - only get body when success --- .../java/com/rx2androidnetworking/Rx2InternalNetworking.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java index f958d764..ad8a5e4d 100644 --- a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java +++ b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java @@ -272,7 +272,6 @@ protected void subscribeActual(Observer observer) { final long startTime = System.currentTimeMillis(); final long startBytes = TrafficStats.getTotalRxBytes(); okHttpResponse = call.execute(); - Utils.saveFile(okHttpResponse, request.getDirPath(), request.getFileName()); final long timeTaken = System.currentTimeMillis() - startTime; if (okHttpResponse.cacheResponse() == null) { final long finalBytes = TrafficStats.getTotalRxBytes(); @@ -296,6 +295,7 @@ protected void subscribeActual(Observer observer) { } } else { if (!call.isCanceled()) { + Utils.saveFile(okHttpResponse, request.getDirPath(), request.getFileName()); ANResponse response = (ANResponse) ANResponse.success(ANConstants.SUCCESS); observer.onNext(response.getResult()); } From aede678ab931da98eabbfd6b8676fb215347f9e1 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Thu, 17 Oct 2019 16:58:29 +0700 Subject: [PATCH 6/8] Update Rx2InternalNetworking.java -- not save when path empty --- .../java/com/rx2androidnetworking/Rx2InternalNetworking.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java index ad8a5e4d..87202633 100644 --- a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java +++ b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java @@ -295,7 +295,9 @@ protected void subscribeActual(Observer observer) { } } else { if (!call.isCanceled()) { - Utils.saveFile(okHttpResponse, request.getDirPath(), request.getFileName()); + if(!TextUtils.isEmpty(request.getDirPath())) { + Utils.saveFile(okHttpResponse, request.getDirPath(), request.getFileName()); + } ANResponse response = (ANResponse) ANResponse.success(ANConstants.SUCCESS); observer.onNext(response.getResult()); } From 6d55ae5b65772e545dfa05b4850a7ec7e20e1ae3 Mon Sep 17 00:00:00 2001 From: tamdragle Date: Thu, 17 Oct 2019 17:27:36 +0700 Subject: [PATCH 7/8] Update Rx2InternalNetworking.java -- import miss library --- .../java/com/rx2androidnetworking/Rx2InternalNetworking.java | 1 + 1 file changed, 1 insertion(+) diff --git a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java index 87202633..34999659 100644 --- a/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java +++ b/rx2-android-networking/src/main/java/com/rx2androidnetworking/Rx2InternalNetworking.java @@ -20,6 +20,7 @@ package com.rx2androidnetworking; import android.net.TrafficStats; +import android.text.TextUtils; import com.androidnetworking.common.ANConstants; import com.androidnetworking.common.ANResponse; From 6517c568da0c6ca8ae81ca113048a883a180e781 Mon Sep 17 00:00:00 2001 From: Tran Thanh Tam Date: Fri, 28 May 2021 11:24:50 +0700 Subject: [PATCH 8/8] update v1.1.2 --- android-networking/build.gradle | 13 +- .../interceptors/HttpLoggingInterceptor.java | 2 +- app/build.gradle | 8 +- build.gradle | 22 +-- gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 72 +++++--- gradlew.bat | 174 +++++++++--------- jackson-android-networking/build.gradle | 10 +- rx-android-networking/build.gradle | 10 +- rx2-android-networking/build.gradle | 12 +- rx2sampleapp/build.gradle | 10 +- rxsampleapp/build.gradle | 8 +- 12 files changed, 175 insertions(+), 169 deletions(-) diff --git a/android-networking/build.gradle b/android-networking/build.gradle index e6a08f9b..dfa5cfb4 100644 --- a/android-networking/build.gradle +++ b/android-networking/build.gradle @@ -27,6 +27,7 @@ android { versionCode 1 versionName "1.0" consumerProguardFiles 'proguard-rules.pro' + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -40,11 +41,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttp3Version" - compile "com.google.code.gson:gson:$rootProject.ext.gsonVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttp3Version" + api "com.google.code.gson:gson:$rootProject.ext.gsonVersion" + api "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" } //apply from: 'upload.gradle' diff --git a/android-networking/src/main/java/com/androidnetworking/interceptors/HttpLoggingInterceptor.java b/android-networking/src/main/java/com/androidnetworking/interceptors/HttpLoggingInterceptor.java index 44f52657..6531948f 100644 --- a/android-networking/src/main/java/com/androidnetworking/interceptors/HttpLoggingInterceptor.java +++ b/android-networking/src/main/java/com/androidnetworking/interceptors/HttpLoggingInterceptor.java @@ -115,7 +115,7 @@ public interface Logger { Logger DEFAULT = new Logger() { @Override public void log(String message) { - Platform.get().log(INFO, message, null); + Platform.get().log(message, INFO, null); } }; } diff --git a/app/build.gradle b/app/build.gradle index e2a4b59e..b38454ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - compile project(':android-networking') + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + implementation project(':android-networking') } diff --git a/build.gradle b/build.gradle index f0944269..202e3dd2 100644 --- a/build.gradle +++ b/build.gradle @@ -23,8 +23,8 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' + classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -44,20 +44,20 @@ task clean(type: Delete) { ext { // App tools version - compileSdkVersion = 27 + compileSdkVersion = 29 minSdkVersion = 14 - targetSdkVersion = 27 - buildToolsVersion = "27.0.3" + targetSdkVersion = 29 + buildToolsVersion = "29.0.2" // App dependencies versions - okHttp3Version = "3.10.0" - gsonVersion = "2.8.2" - jacksonVersion = "2.8.2" + okHttp3Version = "4.7.2" + gsonVersion = "2.8.6" + jacksonVersion = "2.12.0" rxJavaVersion = "1.3.8" rxJavaAndroidVersion = "1.2.1" rxJava2Version = "2.1.12" rxJava2AndroidVersion = "2.0.2" - jUnitVersion = "4.12" - mockWebServerVersion = "3.10.0" - supportAppCompatVersion = "27.1.1" + jUnitVersion = "4.13.2" + mockWebServerVersion = "3.12.0" + supportAppCompatVersion = "28.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b3113037..4d9ca164 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Apr 12 21:48:48 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/gradlew b/gradlew index 9d82f789..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null 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="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@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 DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +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= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jackson-android-networking/build.gradle b/jackson-android-networking/build.gradle index 7e75d80f..9f84cdc3 100644 --- a/jackson-android-networking/build.gradle +++ b/jackson-android-networking/build.gradle @@ -50,11 +50,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "com.fasterxml.jackson.core:jackson-databind:$rootProject.ext.jacksonVersion" - compile project(':android-networking') + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "com.fasterxml.jackson.core:jackson-databind:$rootProject.ext.jacksonVersion" + api project(':android-networking') } //apply from: 'jackson-upload.gradle' diff --git a/rx-android-networking/build.gradle b/rx-android-networking/build.gradle index a8581b9a..2a8b4905 100644 --- a/rx-android-networking/build.gradle +++ b/rx-android-networking/build.gradle @@ -36,10 +36,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "io.reactivex:rxandroid:$rootProject.ext.rxJavaAndroidVersion" - compile "io.reactivex:rxjava:$rootProject.ext.rxJavaVersion" - compile project(':android-networking') + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + api "io.reactivex:rxandroid:$rootProject.ext.rxJavaAndroidVersion" + api "io.reactivex:rxjava:$rootProject.ext.rxJavaVersion" + api project(':android-networking') } //apply from: 'rx-upload.gradle' diff --git a/rx2-android-networking/build.gradle b/rx2-android-networking/build.gradle index 24dd65ec..b3bc0f4c 100644 --- a/rx2-android-networking/build.gradle +++ b/rx2-android-networking/build.gradle @@ -38,11 +38,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - androidTestCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" - compile "io.reactivex.rxjava2:rxandroid:$rootProject.ext.rxJava2AndroidVersion" - compile "io.reactivex.rxjava2:rxjava:$rootProject.ext.rxJava2Version" - compile project(':android-networking') + api fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + androidTestImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.mockWebServerVersion" + api "io.reactivex.rxjava2:rxandroid:$rootProject.ext.rxJava2AndroidVersion" + api "io.reactivex.rxjava2:rxjava:$rootProject.ext.rxJava2Version" + api project(':android-networking') } //apply from: 'rx2-upload.gradle' diff --git a/rx2sampleapp/build.gradle b/rx2sampleapp/build.gradle index 1c38a203..054e0dba 100644 --- a/rx2sampleapp/build.gradle +++ b/rx2sampleapp/build.gradle @@ -42,11 +42,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile project(':rx2-android-networking') + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation project(':rx2-android-networking') } diff --git a/rxsampleapp/build.gradle b/rxsampleapp/build.gradle index 9a99639e..146b9ab2 100644 --- a/rxsampleapp/build.gradle +++ b/rxsampleapp/build.gradle @@ -37,8 +37,8 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile "junit:junit:$rootProject.ext.jUnitVersion" - compile "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" - compile project(':rx-android-networking') + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation "junit:junit:$rootProject.ext.jUnitVersion" + implementation "com.android.support:appcompat-v7:$rootProject.ext.supportAppCompatVersion" + implementation project(':rx-android-networking') }