Merge pull request #1 from aksonov/master

merge
aksonov · Nov 26, 2016 · 2ae0989 · 2ae0989
2 parents 9913e62 + 2f66644
commit 2ae0989
Show file tree

Hide file tree

Showing 14 changed files with 11,043 additions and 260 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,5 @@ local.properties
 #
 node_modules/
 npm-debug.log
+
+.vscode/
diff --git a/Example/__tests__/__snapshots__/Example-test.js.snap b/Example/__tests__/__snapshots__/Example-test.js.snap
diff --git a/Example/android/app/build.gradle b/Example/android/app/build.gradle
@@ -87,7 +87,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.aksonov.routerflux.example"
+        applicationId "com.example"
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1

diff --git a/Example/android/app/src/main/AndroidManifest.xml b/Example/android/app/src/main/AndroidManifest.xml
@@ -1,16 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aksonov.routerflux.example">
+    package="com.example">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    
+
     <application
-      android:name="com.aksonov.routerflux.example.MainApplication"
+      android:name=".MainApplication"
       android:allowBackup="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:theme="@style/AppTheme">
       <activity
-        android:name="com.aksonov.routerflux.example.MainActivity"
+        android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
         <intent-filter>

diff --git a/Example/android/app/src/main/java/com/aksonov/routerflux/example/MainActivity.java b/Example/android/app/src/main/java/com/aksonov/routerflux/example/MainActivity.java
diff --git a/Example/android/app/src/main/java/com/aksonov/routerflux/example/MainApplication.java b/Example/android/app/src/main/java/com/aksonov/routerflux/example/MainApplication.java
diff --git a/Example/android/app/src/main/res/values/strings.xml b/Example/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">React Native Router Flux Example</string>
+    <string name="app_name">Example</string>
 </resources>
diff --git a/Example/android/build.gradle b/Example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:1.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/Example/android/gradle/wrapper/gradle-wrapper.properties b/Example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Sep 14 11:07:56 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
diff --git a/Example/package.json b/Example/package.json
@@ -16,12 +16,12 @@
     "react-native-router-flux": "file:../"
   },
   "devDependencies": {
-    "babel-jest": "^14.1.0",
+    "babel-jest": "^17.0.2",
     "babel-preset-react-native": "^1.9.0",
-    "jest": "^14.1.0",
-    "jest-react-native": "^14.1.1",
-    "react-test-renderer": "^15.3.0",
-    "sane": "^1.3.4"
+    "jest": "^17.0.3",
+    "jest-react-native": "^17.0.3",
+    "react-test-renderer": "15.3.0",
+    "sane": "^1.4.1"
   },
   "jest": {
     "preset": "jest-react-native"