Преглед на файлове

Migrate to using precompiled Detox aar (#5074)

d4vidi преди 5 години
родител
ревизия
42d6ff5a26

+ 2
- 2
package.json Целия файл

@@ -60,7 +60,7 @@
60 60
     "@types/react-native": "0.57.7",
61 61
     "@types/react-test-renderer": "16.x.x",
62 62
     "jsc-android": "236355.x.x",
63
-    "detox": "12.1.x",
63
+    "detox": "12.x.x",
64 64
     "react-native-ui-lib": "3.24.2",
65 65
     "handlebars": "4.x.x",
66 66
     "jest": "23.x.x",
@@ -150,4 +150,4 @@
150 150
       }
151 151
     }
152 152
   }
153
-}
153
+}

+ 1
- 1
playground/android/app/build.gradle Целия файл

@@ -69,6 +69,6 @@ dependencies {
69 69
     implementation project(':react-native-navigation')
70 70
     implementation project(':react-native-view-overflow')
71 71
 
72
-    androidTestImplementation(project(':detox'))
72
+    androidTestImplementation('com.wix:detox:+') { transitive = true }
73 73
     androidTestImplementation 'junit:junit:4.12'
74 74
 }

+ 1
- 0
playground/android/build.gradle Целия файл

@@ -32,5 +32,6 @@ allprojects {
32 32
         maven { url 'https://jitpack.io' }
33 33
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
34 34
         maven { url "$rootDir/../../node_modules/jsc-android/dist" }
35
+        maven { url "$rootDir/../../node_modules/detox/Detox-android" }
35 36
     }
36 37
 }

+ 2
- 2
playground/android/gradle/wrapper/gradle-wrapper.properties Целия файл

@@ -1,6 +1,6 @@
1
-#Wed Feb 14 14:56:47 IST 2018
1
+#Mon May 06 17:35:51 IDT 2019
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-4.6-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

+ 0
- 3
playground/android/settings.gradle Целия файл

@@ -4,8 +4,5 @@ include ':app'
4 4
 include ':react-native-navigation'
5 5
 project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../../lib/android/app/')
6 6
 
7
-include ':detox'
8
-project(':detox').projectDir = new File(rootProject.projectDir, '../../node_modules/detox/android/detox')
9
-
10 7
 include ':react-native-view-overflow'
11 8
 project(':react-native-view-overflow').projectDir = new File(rootProject.projectDir, '../../node_modules/react-native-view-overflow/android')