Ver código fonte

setting up java unit tests

Daniel Zlotin 7 anos atrás
pai
commit
ab0926b375

BIN
android/gradle/wrapper/gradle-wrapper.jar Ver arquivo


+ 2
- 2
android/gradle/wrapper/gradle-wrapper.properties Ver arquivo

@@ -1,6 +1,6 @@
1
-#Wed Jul 13 11:11:29 IDT 2016
1
+#Mon Sep 12 16:05:44 IDT 2016
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

+ 25
- 21
android/gradlew Ver arquivo

@@ -6,12 +6,30 @@
6 6
 ##
7 7
 ##############################################################################
8 8
 
9
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10
-DEFAULT_JVM_OPTS=""
9
+# Attempt to set APP_HOME
10
+# Resolve links: $0 may be a link
11
+PRG="$0"
12
+# Need this for relative symlinks.
13
+while [ -h "$PRG" ] ; do
14
+    ls=`ls -ld "$PRG"`
15
+    link=`expr "$ls" : '.*-> \(.*\)$'`
16
+    if expr "$link" : '/.*' > /dev/null; then
17
+        PRG="$link"
18
+    else
19
+        PRG=`dirname "$PRG"`"/$link"
20
+    fi
21
+done
22
+SAVED="`pwd`"
23
+cd "`dirname \"$PRG\"`/" >/dev/null
24
+APP_HOME="`pwd -P`"
25
+cd "$SAVED" >/dev/null
11 26
 
12 27
 APP_NAME="Gradle"
13 28
 APP_BASE_NAME=`basename "$0"`
14 29
 
30
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31
+DEFAULT_JVM_OPTS=""
32
+
15 33
 # Use the maximum available, or set MAX_FD != -1 to use that value.
16 34
 MAX_FD="maximum"
17 35
 
@@ -30,6 +48,7 @@ die ( ) {
30 48
 cygwin=false
31 49
 msys=false
32 50
 darwin=false
51
+nonstop=false
33 52
 case "`uname`" in
34 53
   CYGWIN* )
35 54
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
40 59
   MINGW* )
41 60
     msys=true
42 61
     ;;
62
+  NONSTOP* )
63
+    nonstop=true
64
+    ;;
43 65
 esac
44 66
 
45
-# Attempt to set APP_HOME
46
-# Resolve links: $0 may be a link
47
-PRG="$0"
48
-# Need this for relative symlinks.
49
-while [ -h "$PRG" ] ; do
50
-    ls=`ls -ld "$PRG"`
51
-    link=`expr "$ls" : '.*-> \(.*\)$'`
52
-    if expr "$link" : '/.*' > /dev/null; then
53
-        PRG="$link"
54
-    else
55
-        PRG=`dirname "$PRG"`"/$link"
56
-    fi
57
-done
58
-SAVED="`pwd`"
59
-cd "`dirname \"$PRG\"`/" >/dev/null
60
-APP_HOME="`pwd -P`"
61
-cd "$SAVED" >/dev/null
62
-
63 67
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64 68
 
65 69
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
85 89
 fi
86 90
 
87 91
 # Increase the maximum file descriptors if we can.
88
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
89 93
     MAX_FD_LIMIT=`ulimit -H -n`
90 94
     if [ $? -eq 0 ] ; then
91 95
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

+ 4
- 4
android/gradlew.bat Ver arquivo

@@ -8,14 +8,14 @@
8 8
 @rem Set local scope for the variables with windows NT shell
9 9
 if "%OS%"=="Windows_NT" setlocal
10 10
 
11
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12
-set DEFAULT_JVM_OPTS=
13
-
14 11
 set DIRNAME=%~dp0
15 12
 if "%DIRNAME%" == "" set DIRNAME=.
16 13
 set APP_BASE_NAME=%~n0
17 14
 set APP_HOME=%DIRNAME%
18 15
 
16
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17
+set DEFAULT_JVM_OPTS=
18
+
19 19
 @rem Find java.exe
20 20
 if defined JAVA_HOME goto findJavaFromJavaHome
21 21
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
46 46
 goto fail
47 47
 
48 48
 :init
49
-@rem Get command-line arguments, handling Windowz variants
49
+@rem Get command-line arguments, handling Windows variants
50 50
 
51 51
 if not "%OS%" == "Windows_NT" goto win9xME_args
52 52
 if "%@eval[2+2]" == "4" goto 4NT_args

+ 8
- 10
package.json Ver arquivo

@@ -1,5 +1,9 @@
1 1
 {
2 2
   "name": "react-native-navigation",
3
+  "version": "2.0.0-experimental.106",
4
+  "description": "React Native Navigation - truly native navigation for iOS and Android",
5
+  "license": "MIT",
6
+  "nativePackage": true,
3 7
   "publishConfig": {
4 8
     "registry": "https://registry.npmjs.org/"
5 9
   },
@@ -7,9 +11,6 @@
7 11
     "type": "git",
8 12
     "url": "https://github.com/wix/react-native-navigation.git"
9 13
   },
10
-  "version": "2.0.0-experimental.106",
11
-  "description": "React Native Navigation - truly native navigation for iOS and Android",
12
-  "nativePackage": true,
13 14
   "bugs": {
14 15
     "url": "https://github.com/wix/react-native-navigation/issues"
15 16
   },
@@ -17,22 +18,19 @@
17 18
   "readme": "https://github.com/wix/react-native-navigation#readme",
18 19
   "main": "src/index.js",
19 20
   "author": "Tal Kol <talkol@gmail.com>",
20
-  "license": "MIT",
21 21
   "scripts": {
22 22
     "build": ":",
23 23
     "lint": "eslint src test",
24 24
     "pretest": "npm run lint",
25
-    "test": ":",
25
+    "test": "cd android && ./gradlew test",
26 26
     "release": "npm version prerelease && npm publish --tag next && npm view react-native-navigation dist-tags && git push"
27 27
   },
28 28
   "peerDependencies": {
29
-    "react-native": ">=0.31.0",
30
-    "react": ">=15.2.1"
29
+    "react-native": "*"
31 30
   },
32 31
   "dependencies": {
33 32
     "react-native-controllers": "^2.0.0",
34
-    "lodash": "^4.13.0",
35
-    "babel-preset-react-native-stage-0": "^1.0.0"
33
+    "lodash": "^4.13.0"
36 34
   },
37 35
   "optionalDependencies": {
38 36
     "react-redux": "*"
@@ -44,7 +42,7 @@
44 42
     "babel-cli": "^6.8.0",
45 43
     "babel-core": "^6.8.0",
46 44
     "babel-polyfill": "^6.8.0",
47
-    "babel-preset-react-native-stage-0": "^1.0.0",
45
+    "babel-preset-react-native": "^1.0.0",
48 46
     "babel-register": "^6.8.0",
49 47
     "eslint": "^2.5.1",
50 48
     "eslint-plugin-babel": "^3.0.0",

+ 3
- 2
src/Navigation.js Ver arquivo

@@ -1,3 +1,4 @@
1
+/*eslint-disable*/
1 2
 import React from 'react';
2 3
 import {AppRegistry} from 'react-native';
3 4
 import platformSpecific from './deprecated/platformSpecificDeprecated';
@@ -33,7 +34,7 @@ function _registerComponentNoRedux(screenID, generator) {
33 34
           internalProps: {...props, ...PropRegistry.load(props.screenInstanceID)}
34 35
         }
35 36
       }
36
-  
37
+
37 38
       componentWillReceiveProps(nextProps) {
38 39
         this.setState({
39 40
           internalProps: {...PropRegistry.load(this.props.screenInstanceID), ...nextProps}
@@ -64,7 +65,7 @@ function _registerComponentRedux(screenID, generator, store, Provider) {
64 65
           internalProps: {...props, ...PropRegistry.load(props.screenInstanceID)}
65 66
         }
66 67
       }
67
-      
68
+
68 69
       componentWillReceiveProps(nextProps) {
69 70
         this.setState({
70 71
           internalProps: {...PropRegistry.load(this.props.screenInstanceID), ...nextProps}

+ 1
- 0
src/Screen.js Ver arquivo

@@ -1,3 +1,4 @@
1
+/*eslint-disable*/
1 2
 import React, {Component} from 'react';
2 3
 import {
3 4
   NativeAppEventEmitter,

+ 1
- 0
src/deprecated/platformSpecificDeprecated.android.js Ver arquivo

@@ -1,3 +1,4 @@
1
+/*eslint-disable*/
1 2
 import React, {Component} from 'react';
2 3
 import {AppRegistry, NativeModules} from 'react-native';
3 4
 import _ from 'lodash';

+ 1
- 0
src/deprecated/platformSpecificDeprecated.ios.js Ver arquivo

@@ -1,3 +1,4 @@
1
+/*eslint-disable*/
1 2
 import Navigation from './../Navigation';
2 3
 import Controllers, {Modal, Notification} from 'react-native-controllers';
3 4
 const React = Controllers.hijackReact();