upgrade to newest releases

bartonhammond · Aug 30, 2016 · 5279b42 · 5279b42
1 parent bade73f
commit 5279b42
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 152 deletions.
diff --git a/android/app/BUCK b/android/app/BUCK
@@ -5,7 +5,7 @@ import re
 # - install Buck
 # - `npm start` - to start the packager
 # - `cd android`
-# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
 # - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
 # - `buck install -r android/app` - compile, install and run application
 #

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -126,19 +126,12 @@ android {
 }
 
 dependencies {
-
+    compile project(':react-native-vector-icons')
+    compile project(':react-native-simpledialog-android')
+    compile project(':react-native-i18n')
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
-
-   // Added this line:
-    compile project(':react-native-vector-icons')
-
-    // Added this line:
-    compile project(':RNSimpleAlertDialogModule')
-
-    // Added this line:
-    compile project(':react-native-i18n')        
 }
 
 // Run this once to be able to run the application with BUCK

diff --git a/android/app/src/main/java/com/snowflake/MainApplication.java b/android/app/src/main/java/com/snowflake/MainApplication.java
@@ -4,6 +4,9 @@
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.burnweb.rnsimplealertdialog.RNSimpleAlertDialogPackage;
+import com.i18n.reactnativei18n.ReactNativeI18n;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -12,13 +15,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-// Add this line:
-import com.oblador.vectoricons.VectorIconsPackage;
-// Add this line:
-import com.burnweb.rnsimplealertdialog.RNSimpleAlertDialogPackage;  
-// Add this line:
-import com.i18n.reactnativei18n.ReactNativeI18n;
-
 public class MainApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
@@ -30,12 +26,11 @@ protected boolean getUseDeveloperSupport() {
     @Override
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
-                                         new MainReactPackage(),
-                                         //Added two lines
-                                         new RNSimpleAlertDialogPackage(),
-                                         new VectorIconsPackage(),
-                                         new ReactNativeI18n()
-                                         );
+          new MainReactPackage(),
+            new VectorIconsPackage(),
+            new RNSimpleAlertDialogPackage(),
+            new ReactNativeI18n()
+      );
     }
   };
 

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -2,5 +2,8 @@
 
 
 
+
+
+
     <string name="app_name">snowflake</string>
 </resources>
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,15 +1,9 @@
 rootProject.name = 'snowflake'
 
 include ':app'
-include ':react-native-i18n'
-project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
-
-
-//Added the following two lines        
-include ':RNSimpleAlertDialogModule', ':app'
-project(':RNSimpleAlertDialogModule').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-simpledialog-android/android')
-
-//Added the following two lines:
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
-
+include ':react-native-simpledialog-android'
+project(':react-native-simpledialog-android').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-simpledialog-android/android')
+include ':react-native-i18n'
+project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
diff --git a/ios/snowflake.xcodeproj/project.pbxproj b/ios/snowflake.xcodeproj/project.pbxproj
diff --git a/ios/snowflake/AppDelegate.m b/ios/snowflake/AppDelegate.m
@@ -18,7 +18,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 {
   NSURL *jsCodeLocation;
 
-  [[RCTBundleURLProvider sharedSettings] setDefaults];
   jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation

diff --git a/ios/snowflake/Info.plist b/ios/snowflake/Info.plist
@@ -2,18 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
   <dict>
-    <key>UIAppFonts</key>
-    <array>
-      <string>FontAwesome.ttf</string>
-      <string>Entypo.ttf</string>
-      <string>EvilIcons.ttf</string>
-      <string>FontAwesome.ttf</string>
-      <string>Foundation.ttf</string>
-      <string>Ionicons.ttf</string>
-      <string>MaterialIcons.ttf</string>
-      <string>Octicons.ttf</string>
-      <string>Zocial.ttf</string>
-    </array>
     <key>CFBundleDevelopmentRegion</key>
     <string>en</string>
     <key>CFBundleExecutable</key>
@@ -53,7 +41,7 @@
     <key>NSAppTransportSecurity</key>
     <dict>
       <key>NSAllowsArbitraryLoads</key>
-      <true/>
+      <true/>      
       <key>NSExceptionDomains</key>
       <dict>
         <key>localhost</key>
@@ -63,5 +51,16 @@
         </dict>
       </dict>
     </dict>
+    <key>UIAppFonts</key>
+    <array>
+      <string>Entypo.ttf</string>
+      <string>EvilIcons.ttf</string>
+      <string>FontAwesome.ttf</string>
+      <string>Foundation.ttf</string>
+      <string>Ionicons.ttf</string>
+      <string>MaterialIcons.ttf</string>
+      <string>Octicons.ttf</string>
+      <string>Zocial.ttf</string>
+    </array>
   </dict>
-</plist>
+</plist>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "snowflake",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "private": true,
   "jest": {
     "preset": "jest-react-native",
@@ -14,15 +14,15 @@
     "verbose": true
   },
   "standard": {
-      "globals": [
-          "jest",
-          "expect",
-          "it",
-          "describe",
-          "fetch",
-          "beforeEach"
-      ],
-      "parser": "babel-eslint"      
+    "globals": [
+      "jest",
+      "expect",
+      "it",
+      "describe",
+      "fetch",
+      "beforeEach"
+    ],
+    "parser": "babel-eslint"
   },
   "scripts": {
     "format": "standard --fix",
@@ -36,17 +36,17 @@
     "apsl-react-native-button": "3.0.0",
     "immutable": "3.8.1",
     "key-mirror": "1.0.1",
-    "react": "15.2.1",
-    "react-mixin": "^2.0.2",
-    "react-native": "0.30.0",
+    "react": "15.3.0",
+    "react-mixin": "2.0.2",
+    "react-native": "0.32.0",
     "react-native-i18n": "0.0.8",
     "react-native-navbar": "1.5.0",
     "react-native-router-flux": "3.31.1",
     "react-native-simple-store": "1.0.1",
     "react-native-simpledialog-android": "1.0.7",
     "react-native-vector-icons": "2.0.3",
     "react-redux": "4.4.5",
-    "react-timer-mixin": "^0.13.3",
+    "react-timer-mixin": "0.13.3",
     "redux": "3.5.2",
     "redux-thunk": "2.1.0",
     "regenerator": "0.8.46",
@@ -57,16 +57,16 @@
   },
   "devDependencies": {
     "babel-core": "6.9.0",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "6.1.2",
     "babel-jest": "14.0.0",
     "babel-preset-react-native": "1.8.0",
     "docker": "1.0.0",
     "istanbul": "0.4.3",
-    "jest": "14.0.0",
-    "jest-react-native": "14.0.0",
+    "jest": "14.1.0",
+    "jest-react-native": "14.1.3",
     "react-addons-test-utils": "15.0.2",
     "redux-mock-store": "1.1.2",
     "rnpm-plugin-upgrade": "0.26.0",
-    "standard": "^8.0.0"
+    "standard": "8.0.0"
   }
 }