From 26b9b79f57230559b2cf5e24083649bf4c799314 Mon Sep 17 00:00:00 2001 From: emalamela Date: Thu, 7 Jun 2018 15:28:17 -0300 Subject: [PATCH 1/2] Bump to Wolmo Core version 2.0.3 to fix building issues --- build.gradle | 5 ++--- networking/build.gradle | 27 ++------------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 2d80bb8..d810b70 100755 --- a/build.gradle +++ b/build.gradle @@ -3,13 +3,12 @@ buildscript { repositories { mavenCentral() - jcenter() google() + jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files classpath 'com.google.gms:google-services:3.1.0' @@ -20,8 +19,8 @@ buildscript { allprojects { repositories { - jcenter() google() + jcenter() maven { url "https://jitpack.io" } maven { url "https://oss.sonatype.org/content/repositories/snapshots" } diff --git a/networking/build.gradle b/networking/build.gradle index 784921a..e912870 100755 --- a/networking/build.gradle +++ b/networking/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'jacoco-android' apply plugin: 'com.github.kt3k.coveralls' -apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.Wolox' @@ -35,7 +34,7 @@ coveralls { } buildscript { - ext.wolmo_version = '2.0.2' + ext.wolmo_version = '2.0.3' ext.retrofit_version = '2.3.0' ext.okhttp3_version = '3.9.0' ext.dagger_version = '2.13' @@ -62,26 +61,4 @@ dependencies { testImplementation "org.mockito:mockito-inline:2.13.0" // Mockito inline adds support for mocking final classes and methods testImplementation "org.assertj:assertj-core:3.9.0" testImplementation "com.squareup.okhttp3:mockwebserver:$okhttp3_version" -} - -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar - archives javadocJar -} +} \ No newline at end of file From cbbf4369162fa8eb4a7dabad27cd2e90a0ec16d4 Mon Sep 17 00:00:00 2001 From: emalamela Date: Thu, 7 Jun 2018 15:28:31 -0300 Subject: [PATCH 2/2] Remove unnecesary static TRIES field from CallUtils --- .../java/ar/com/wolox/wolmo/networking/utils/CallUtils.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/networking/src/main/java/ar/com/wolox/wolmo/networking/utils/CallUtils.java b/networking/src/main/java/ar/com/wolox/wolmo/networking/utils/CallUtils.java index 65e531b..787753e 100644 --- a/networking/src/main/java/ar/com/wolox/wolmo/networking/utils/CallUtils.java +++ b/networking/src/main/java/ar/com/wolox/wolmo/networking/utils/CallUtils.java @@ -26,12 +26,11 @@ import com.android.internal.util.Predicate; -import ar.com.wolox.wolmo.networking.exception.PollRunOutOfTriesException; - import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.TimeUnit; +import ar.com.wolox.wolmo.networking.exception.PollRunOutOfTriesException; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -68,8 +67,6 @@ public static Timer pollWithDelay(@IntRange(from = 1) final int tries, return pollingTimer; } - public static int TRIES = 0; - private static void pollWithDelay(@IntRange(from = 1) final int triesRemaining, @NonNull final Call call, @NonNull final Predicate> pollingCondition, @@ -104,6 +101,5 @@ public void onFailure(Call call, Throwable t) { callback.onFailure(call, t); } }); - TRIES++; } }