Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 2.0.2 issues #20

Merged
merged 2 commits into from
Jun 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -20,8 +19,8 @@ buildscript {

allprojects {
repositories {
jcenter()
google()
jcenter()
maven { url "https://jitpack.io" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }

Expand Down
27 changes: 2 additions & 25 deletions networking/build.gradle
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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'
Expand All @@ -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
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -68,8 +67,6 @@ public static <T> Timer pollWithDelay(@IntRange(from = 1) final int tries,
return pollingTimer;
}

public static int TRIES = 0;

private static <T> void pollWithDelay(@IntRange(from = 1) final int triesRemaining,
@NonNull final Call<T> call,
@NonNull final Predicate<Response<T>> pollingCondition,
Expand Down Expand Up @@ -104,6 +101,5 @@ public void onFailure(Call<T> call, Throwable t) {
callback.onFailure(call, t);
}
});
TRIES++;
}
}