Updates

- Gradle to 2.9
- Android Gradle plugin to 1.5.0
- Bridge to 1.7.0

Author: rubengees

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Mon Nov 16 09:32:07 CET 2015
+#Tue Nov 24 22:16:28 CET 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -24,7 +24,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-annotations:23.1.1'
-    compile 'com.github.afollestad:bridge:1.6.4@aar'
+    compile 'com.github.afollestad:bridge:1.7.0@aar'
 }
 
 // build a jar with source files

gradlew

@@ -1,6 +1,6 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     package="com.proxerme.library">
 
-    <application tools:ignore="AllowBackup" />
+    <application tools:ignore="AllowBackup,GoogleAppIndexingWarning" />
 
 </manifest>

library/build.gradle

@@ -97,33 +97,21 @@ public static ConferencesRequest loadConferences(@IntRange(from = 1) int page) {
     }
 
     /**
-     * Cancels all asynchronous started requests of the specified tag.
+     * Cancels all started requests of the specified tag.
      *
      * @param tag The {@link ProxerTag} to cancel
      * @see ProxerTag
-     * @see #cancelSync(int)
      */
     public static void cancel(@ConnectionTag int tag) {
-        Bridge.client().cancelAll(tag, false);
-    }
-
-    /**
-     * Cancels all synchronous started requests of the specified tag.
-     *
-     * @param tag The {@link ProxerTag} to cancel
-     * @see ProxerTag
-     * @see #cancel(int)
-     */
-    public static void cancelSync(@ConnectionTag int tag) {
-        Bridge.client().cancelAllSync(tag, false);
+        Bridge.cancelAll().tag(String.valueOf(tag)).commit();
     }
 
     /**
      * Does some initialization steps. You *must* call this method somewhere in your lifecycle. A
      * good place might be the onCreate method of your main Activity.
      */
     public static void init() {
-        Bridge.client().config().validators(new ResponseValidator() {
+        Bridge.config().validators(new ResponseValidator() {
             @Override
             public boolean validate(@NonNull Response response) throws Exception {
                 JSONObject json = response.asJsonObject();
@@ -163,7 +151,7 @@ public static void cleanup() {
         }
 
         parseThreads.clear();
-        Bridge.cleanup();
+        Bridge.destroy();
     }
 
     /**
@@ -201,11 +189,10 @@ public static abstract class ProxerRequest<T> {
          * {@link #execute(ResultCallback)} or
          * {@link #executeSynchronized()} method.
          *
-         * @param bridge The Bridge instance to build the request with.
          * @return The {@link RequestBuilder} to use for further invocations.
          */
         @NonNull
-        protected abstract RequestBuilder buildRequest(@NonNull Bridge bridge);
+        protected abstract RequestBuilder buildRequest();
 
         /**
          * Returns the {@link ProxerTag} of this request.
@@ -223,7 +210,7 @@ public static abstract class ProxerRequest<T> {
          */
         @RequiresPermission(android.Manifest.permission.INTERNET)
         public final void execute(@NonNull final ResultCallback<T> callback) {
-            buildRequest(Bridge.client()).tag(getTag()).request(new Callback() {
+            buildRequest().tag(getTag()).request(new Callback() {
                 @Override
                 public void response(Request request, final Response response, BridgeException exception) {
                     if (exception == null) {
@@ -279,7 +266,7 @@ public void run() {
         @RequiresPermission(android.Manifest.permission.INTERNET)
         public final T executeSynchronized() throws ProxerException {
             try {
-                JSONObject result = buildRequest(Bridge.client()).tag(getTag() + 1).asJsonObject();
+                JSONObject result = buildRequest().tag(getTag() + 1).asJsonObject();
 
                 return parse(result);
             } catch (JSONException e) {
@@ -312,8 +299,8 @@ public NewsRequest(@IntRange(from = 1) int page) {
 
         @NonNull
         @Override
-        protected RequestBuilder buildRequest(@NonNull Bridge bridge) {
-            return bridge.get(UrlHolder.getNewsUrl(page));
+        protected RequestBuilder buildRequest() {
+            return Bridge.get(UrlHolder.getNewsUrl(page));
         }
 
         @ConnectionTag
@@ -341,11 +328,11 @@ public LoginRequest(@NonNull LoginUser user) {
 
         @NonNull
         @Override
-        protected RequestBuilder buildRequest(@NonNull Bridge bridge) {
+        protected RequestBuilder buildRequest() {
             Form loginCredentials = new Form().add(FORM_USERNAME, user.getUsername())
                     .add(FORM_PASSWORD, user.getPassword());
 
-            return bridge.post(UrlHolder.getLoginUrl()).body(loginCredentials);
+            return Bridge.post(UrlHolder.getLoginUrl()).body(loginCredentials);
         }
 
         @ConnectionTag
@@ -370,8 +357,8 @@ public static class LogoutRequest extends ProxerRequest<Void> {
 
         @NonNull
         @Override
-        protected RequestBuilder buildRequest(@NonNull Bridge bridge) {
-            return bridge.get(UrlHolder.getLogoutUrl());
+        protected RequestBuilder buildRequest() {
+            return Bridge.get(UrlHolder.getLogoutUrl());
         }
 
         @ConnectionTag
@@ -399,8 +386,8 @@ public ConferencesRequest(@IntRange(from = 1) int page) {
 
         @NonNull
         @Override
-        protected RequestBuilder buildRequest(@NonNull Bridge bridge) {
-            return bridge.get(UrlHolder.getConferencesUrl(page));
+        protected RequestBuilder buildRequest() {
+            return Bridge.get(UrlHolder.getConferencesUrl(page));
         }
 
         @Override