From 699ec6480731c7be4402eb41ecc6caeb046a3cbe Mon Sep 17 00:00:00 2001 From: Horcrux Date: Wed, 14 Sep 2016 19:40:04 +0800 Subject: [PATCH] update gradle and ESLint related dependencies --- Example/android/build.gradle | 2 +- Example/android/gradlew | 10 +++------- package.json | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Example/android/build.gradle b/Example/android/build.gradle index fcba4c58..c8978a98 100644 --- a/Example/android/build.gradle +++ b/Example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:2.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Example/android/gradlew b/Example/android/gradlew index 91a7e269..9d82f789 100644 --- a/Example/android/gradlew +++ b/Example/android/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/package.json b/package.json index 9601d982..60d9cb4b 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,9 @@ "lodash": "^4.0.0" }, "devDependencies": { - "babel-eslint": "^6.0.0", - "eslint": "^2.5.3", - "eslint-plugin-react": "^4.2.1" + "babel-eslint": "^6.1.2", + "eslint": "^2.13.1", + "eslint-plugin-react": "^4.3.0" }, "nativePackage": true, "rnpm": {