Merge branch 'v1.4'

artis-auxilium · Sep 13, 2017 · 2c70d4f · 2c70d4f
2 parents b01edaa + 88c1226
commit 2c70d4f
Show file tree

Hide file tree

Showing 11 changed files with 5,866 additions and 804 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["react-native"]
+}
diff --git a/CachedImageExample/android/app/src/main/java/com/cachedimageexample/MainApplication.java b/CachedImageExample/android/app/src/main/java/com/cachedimageexample/MainApplication.java
@@ -20,7 +20,7 @@ public class MainApplication extends Application implements ReactApplication {
 
     private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
         @Override
-        protected boolean getUseDeveloperSupport() {
+        public boolean getUseDeveloperSupport() {
             return BuildConfig.DEBUG;
         }
 
@@ -43,11 +43,6 @@ public ReactNativeHost getReactNativeHost() {
         return mReactNativeHost;
     }
 
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
-
     @Override
     public void onCreate() {
         super.onCreate();

diff --git a/CachedImageExample/package.json b/CachedImageExample/package.json
@@ -9,15 +9,15 @@
   },
   "dependencies": {
     "react": "16.0.0-alpha.12",
-    "react-native": "0.46.4",
+    "react-native": "^0.48.3",
     "react-native-cached-image": "../"
   },
   "devDependencies": {
-    "babel-jest": "18.0.0",
-    "babel-preset-react-native": "1.9.1",
-    "jest": "18.1.0",
-    "react-test-renderer": "15.4.2",
-    "sane": "^1.5.0"
+    "babel-jest": "^21.0.2",
+    "babel-preset-react-native": "^3.0.2",
+    "jest": "^21.0.2",
+    "react-test-renderer": "^15.6.1",
+    "sane": "^2.0.0"
   },
   "jest": {
     "preset": "react-native"