Merge pull request #69 from FrangSierra/development

Development

Author: FrangSierra

app/build.gradle

@@ -2,11 +2,12 @@ buildscript {
     ext {
         rx_version = "2.1.10"
         rx_android_version = "2.0.2"
-        firebase_auth_version='16.0.3'
-        firebase_database_version='16.0.2'
-        firebase_storage_version='16.0.2'
-        firebase_firestore_version='17.1.0'
-        firebase_functions_version='16.1.0'
+        firebase_auth_version='16.0.5'
+        firebase_database_version='16.0.4'
+        firebase_storage_version='16.0.4'
+        firebase_firestore_version='17.1.3'
+        firebase_functions_version='16.1.3'
+        firebase_remote_version='16.1.0'
         support_version = "27.0.2"
     }
 }
@@ -26,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 5
-        versionName "1.3"
+        versionCode 6
+        versionName "1.5.5"
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
 }
@@ -43,14 +44,16 @@ dependencies {
     compileOnly "com.google.firebase:firebase-storage:$firebase_storage_version"
     compileOnly "com.google.firebase:firebase-firestore:$firebase_firestore_version"
     compileOnly "com.google.firebase:firebase-functions:$firebase_functions_version"
-    compileOnly "com.android.support:recyclerview-v7:$support_version"
+    compileOnly "com.google.firebase:firebase-config:$firebase_remote_version"
+
     implementation "io.reactivex.rxjava2:rxjava:$rx_version"
     implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version"
 
     testImplementation "com.google.firebase:firebase-auth:$firebase_auth_version"
     testImplementation "com.google.firebase:firebase-database:$firebase_database_version"
     testImplementation "com.google.firebase:firebase-storage:$firebase_storage_version"
     testImplementation "com.google.firebase:firebase-firestore:$firebase_firestore_version"
+    testImplementation "com.google.firebase:firebase-config:$firebase_remote_version"
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.mockito:mockito-core:2.2.16"
+    testImplementation "org.mockito:mockito-core:2.11.0"
 }

app/src/main/java/durdinapps/rxfirebase2/DataSnapshotMapper.java

@@ -44,10 +44,16 @@ public static <U> DataSnapshotMapper<RxFirebaseChildEvent<DataSnapshot>, RxFireb
     }
 
     private static <U> U getDataSnapshotTypedValue(DataSnapshot dataSnapshot, Class<U> clazz) {
-        U value = dataSnapshot.getValue(clazz);
+        U value;
+        try {
+            value = dataSnapshot.getValue(clazz);
+        } catch (Exception ex) {
+            throw Exceptions.propagate(new RxFirebaseDataCastException(
+                "There was a problem trying to cast " + dataSnapshot.toString() + " to " + clazz.getSimpleName(), ex));
+        }
         if (value == null) {
             throw Exceptions.propagate(new RxFirebaseDataCastException(
-                "unable to cast firebase data response to " + clazz.getSimpleName()));
+                "The value after cast  " + dataSnapshot.toString() + " to " + clazz.getSimpleName() + "is null."));
         }
         return value;
     }

app/src/main/java/durdinapps/rxfirebase2/RxCompletableHandler.java

@@ -9,9 +9,6 @@
 
 import io.reactivex.CompletableEmitter;
 
-/**
- * Created by Durdin on 13/11/2016.
- */
 
 public class RxCompletableHandler implements OnFailureListener, OnSuccessListener, OnCompleteListener {
 

app/src/main/java/durdinapps/rxfirebase2/RxFirebaseChildEvent.java

@@ -3,7 +3,6 @@
 
 import android.support.annotation.NonNull;
 
-
 public class RxFirebaseChildEvent<T> {
 
     private EventType eventType;