change .eslintrc and update

attentiveness · Jan 2, 2017 · 8f89044 · 8f89044
1 parent 1e491b6
commit 8f89044
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -3,7 +3,7 @@
     "env": {
         "browser": true,
         "node": true,
-        "mocha": true
+        "jest": true
     },
     "ecmaFeatures": {
         "forOf": true,

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -90,7 +90,7 @@ def enableProguardInReleaseBuilds = true
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
@@ -166,7 +166,7 @@ andResGuard {   // ./gradlew resguard
             "resources.arsc"
     ]
     sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.1.9'
+        artifact = 'com.tencent.mm:SevenZip:1.1.16'
         //在设置sevenzip时, 你只需设置artifact或path. 支持同时设置,总以path的值为优先
         //path = "/usr/local/bin/7za"
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
-        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.1.9'
+        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.1.16'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -18,7 +18,7 @@ allprojects {
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$projectDir/../../node_modules/react-native/android"
+            url "$rootDir/../node_modules/react-native/android"
         }
     }
 }
diff --git a/ios/reading/Info.plist b/ios/reading/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
 	<string></string>
 	<key>CFBundleExecutable</key>
@@ -46,16 +46,16 @@
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
-		<key>NSExceptionDomains</key>
-    <dict>
-        <key>localhost</key>
-        <dict>
-            <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-            <true/>
-        </dict>
-    </dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>