Skip to content

Commit 9fc5f28

Browse files
chakrihackerKrzysztof Borowy
authored andcommitted
chore: upgrade detox (#95)
* Upgrade detox * migrate android to androidx * detox android migration * remove dependency comments
1 parent 9dffa5c commit 9fc5f28

File tree

6 files changed

+85
-25
lines changed

6 files changed

+85
-25
lines changed

example/android/app/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ android {
117117
versionCode 1
118118
versionName "1.0"
119119
testBuildType System.getProperty('testBuildType', 'debug')
120-
missingDimensionStrategy "minReactNative", "minReactNative46"
121-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
120+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
122121
}
123122
splits {
124123
abi {
@@ -132,6 +131,7 @@ android {
132131
release {
133132
minifyEnabled enableProguardInReleaseBuilds
134133
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
134+
proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
135135
signingConfig signingConfigs.release
136136
matchingFallbacks = ['release']
137137
}
@@ -157,10 +157,8 @@ dependencies {
157157
implementation "com.facebook.react:react-native:+" // From node_modules
158158

159159
// tests
160-
androidTestImplementation project(":detox")
160+
androidTestImplementation ('com.wix:detox:+') { transitive = true }
161161
androidTestImplementation 'junit:junit:4.12'
162-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
163-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
164162
}
165163

166164
// Run this once to be able to run the application with BUCK

example/android/app/src/androidTest/java/com/asyncstorageexample/DetoxTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.asyncstorageexample;
22

3-
import android.support.test.filters.LargeTest;
4-
import android.support.test.rule.ActivityTestRule;
5-
import android.support.test.runner.AndroidJUnit4;
3+
import androidx.test.filters.LargeTest;
4+
import androidx.test.rule.ActivityTestRule;
5+
import androidx.test.runner.AndroidJUnit4;
66

77
import com.wix.detox.Detox;
88

example/android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ allprojects {
2828
maven {
2929
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
3030
url "$rootDir/../../node_modules/react-native/android"
31-
}
31+
}
32+
maven { url "$rootDir/../../node_modules/detox/Detox-android" }
3233
}
3334
}
3435

example/android/settings.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ rootProject.name = 'AsyncStorageExample'
22

33
include ':app'
44
include ':rnAsyncStorage'
5-
include ':detox'
65

76

87
project(':rnAsyncStorage').projectDir = new File(rootProject.projectDir, '../../android')
9-
project(':detox').projectDir = new File(rootProject.projectDir, '../../node_modules/detox/android/detox')

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"babel-core": "7.0.0-bridge.0",
4444
"babel-jest": "24.1.0",
4545
"babel-plugin-module-resolver": "3.1.3",
46-
"detox": "10.0.7",
46+
"detox": "12.6.1",
4747
"eslint": "5.1.0",
4848
"flow-bin": "0.86.0",
4949
"jest": "24.1.0",

yarn.lock

Lines changed: 76 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@
715715
universal-user-agent "^2.0.0"
716716
url-template "^2.0.8"
717717

718-
"@react-native-community/eslint-config@^0.0.2":
718+
"@react-native-community/[email protected]":
719719
version "0.0.2"
720720
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-config/-/eslint-config-0.0.2.tgz#042224762e00ef06b45693a14be78ebda5fb7def"
721721
integrity sha512-oKtMR046Ptfjvzd67MPm7Q8a5H8MeMsKB7E5bKgcMoybdZBmrsqo3Fn49FCKwc6yHd4KUkTyQihE4Fgk9jaanA==
@@ -969,6 +969,11 @@ ansi-regex@^4.0.0:
969969
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
970970
integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
971971

972+
ansi-regex@^4.1.0:
973+
version "4.1.0"
974+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
975+
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
976+
972977
ansi-styles@^2.2.1:
973978
version "2.2.1"
974979
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1907,7 +1912,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
19071912
dependencies:
19081913
delayed-stream "~1.0.0"
19091914

1910-
commander@^2.15.1, commander@^2.9.0:
1915+
commander@^2.9.0:
19111916
version "2.19.0"
19121917
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
19131918
integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2353,15 +2358,15 @@ detect-newline@^2.1.0:
23532358
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
23542359
integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
23552360

2356-
detox@10.0.7:
2357-
version "10.0.7"
2358-
resolved "https://registry.yarnpkg.com/detox/-/detox-10.0.7.tgz#559e0239ae10a1bada24426608c02cb32a73e15d"
2359-
integrity sha512-oHunX6M+5qy01Sy+o0MGInOkFpROKFfDXU7Z9aUywlXSjNxCUHFUc4J/mgJdFYTogA2W3Md+Mt4kc89+nwqztQ==
2361+
detox@12.6.1:
2362+
version "12.6.1"
2363+
resolved "https://registry.yarnpkg.com/detox/-/detox-12.6.1.tgz#c1b58d64959f0fff66c5e1ed00363e9121ed5061"
2364+
integrity sha512-8NCBFujw/BIfLANfoi0YMME5HvfI4+1FiE5Yd4l0QHxPK75OPhA+4m7o7PB2nWSesQQ+jYduEAZuFq3e+lskkQ==
23602365
dependencies:
23612366
bunyan "^1.8.12"
23622367
bunyan-debug-stream "^1.1.0"
2368+
chalk "^2.4.2"
23632369
child-process-promise "^2.2.0"
2364-
commander "^2.15.1"
23652370
fs-extra "^4.0.2"
23662371
get-port "^2.1.0"
23672372
ini "^1.3.4"
@@ -2370,10 +2375,12 @@ [email protected]:
23702375
proper-lockfile "^3.0.2"
23712376
sanitize-filename "^1.6.1"
23722377
shell-utils "^1.0.9"
2373-
tail "^1.2.3"
2378+
tail "^2.0.0"
23742379
telnet-client "0.15.3"
23752380
tempfile "^2.0.0"
23762381
ws "^1.1.1"
2382+
yargs "^13.0.0"
2383+
yargs-parser "^13.0.0"
23772384

23782385
dezalgo@^1.0.0, dezalgo@~1.0.3:
23792386
version "1.0.3"
@@ -2480,6 +2487,11 @@ [email protected]:
24802487
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
24812488
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
24822489

2490+
emoji-regex@^7.0.1:
2491+
version "7.0.3"
2492+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
2493+
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
2494+
24832495
encodeurl@~1.0.1, encodeurl@~1.0.2:
24842496
version "1.0.2"
24852497
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3361,6 +3373,11 @@ get-caller-file@^1.0.1:
33613373
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
33623374
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
33633375

3376+
get-caller-file@^2.0.1:
3377+
version "2.0.5"
3378+
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
3379+
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
3380+
33643381
get-port@^2.1.0:
33653382
version "2.1.0"
33663383
resolved "https://registry.yarnpkg.com/get-port/-/get-port-2.1.0.tgz#8783f9dcebd1eea495a334e1a6a251e78887ab1a"
@@ -6366,7 +6383,7 @@ os-locale@^2.0.0:
63666383
lcid "^1.0.0"
63676384
mem "^1.1.0"
63686385

6369-
os-locale@^3.0.0:
6386+
os-locale@^3.0.0, os-locale@^3.1.0:
63706387
version "3.1.0"
63716388
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
63726389
integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -7406,6 +7423,11 @@ require-main-filename@^1.0.1:
74067423
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
74077424
integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
74087425

7426+
require-main-filename@^2.0.0:
7427+
version "2.0.0"
7428+
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
7429+
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
7430+
74097431
require-uncached@^1.0.3:
74107432
version "1.0.3"
74117433
resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -8131,6 +8153,15 @@ string-width@^1.0.1:
81318153
is-fullwidth-code-point "^2.0.0"
81328154
strip-ansi "^4.0.0"
81338155

8156+
string-width@^3.0.0:
8157+
version "3.1.0"
8158+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
8159+
integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
8160+
dependencies:
8161+
emoji-regex "^7.0.1"
8162+
is-fullwidth-code-point "^2.0.0"
8163+
strip-ansi "^5.1.0"
8164+
81348165
string.prototype.matchall@^2.0.0:
81358166
version "2.0.0"
81368167
resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
@@ -8180,6 +8211,13 @@ strip-ansi@^5.0.0:
81808211
dependencies:
81818212
ansi-regex "^4.0.0"
81828213

8214+
strip-ansi@^5.1.0:
8215+
version "5.2.0"
8216+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
8217+
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
8218+
dependencies:
8219+
ansi-regex "^4.1.0"
8220+
81838221
strip-bom@^3.0.0:
81848222
version "3.0.0"
81858223
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -8249,10 +8287,10 @@ table@^4.0.3:
82498287
slice-ansi "1.0.0"
82508288
string-width "^2.1.1"
82518289

8252-
tail@^1.2.3:
8253-
version "1.4.0"
8254-
resolved "https://registry.yarnpkg.com/tail/-/tail-1.4.0.tgz#884b216220b90804bfe87a4c8174c2efed0e2661"
8255-
integrity sha512-wjwfZw6wcMFTB1Po7NFUf4TdCDwX8duZjdTMhnHBEC677Q6mFRcVZE7f/nZDhG2Fpf/wEEKOJP9L7/b11/vlHQ==
8290+
tail@^2.0.0:
8291+
version "2.0.2"
8292+
resolved "https://registry.yarnpkg.com/tail/-/tail-2.0.2.tgz#86073f3a9a568807b7fd886897a7350314275b5f"
8293+
integrity sha512-raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ==
82568294

82578295
tar@^2.0.0:
82588296
version "2.2.1"
@@ -8985,6 +9023,14 @@ yargs-parser@^11.1.1:
89859023
camelcase "^5.0.0"
89869024
decamelize "^1.2.0"
89879025

9026+
yargs-parser@^13.0.0:
9027+
version "13.0.0"
9028+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
9029+
integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
9030+
dependencies:
9031+
camelcase "^5.0.0"
9032+
decamelize "^1.2.0"
9033+
89889034
yargs-parser@^7.0.0:
89899035
version "7.0.0"
89909036
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -9035,6 +9081,23 @@ yargs@^12.0.0, yargs@^12.0.2:
90359081
y18n "^3.2.1 || ^4.0.0"
90369082
yargs-parser "^11.1.1"
90379083

9084+
yargs@^13.0.0:
9085+
version "13.2.2"
9086+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
9087+
integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
9088+
dependencies:
9089+
cliui "^4.0.0"
9090+
find-up "^3.0.0"
9091+
get-caller-file "^2.0.1"
9092+
os-locale "^3.1.0"
9093+
require-directory "^2.1.1"
9094+
require-main-filename "^2.0.0"
9095+
set-blocking "^2.0.0"
9096+
string-width "^3.0.0"
9097+
which-module "^2.0.0"
9098+
y18n "^4.0.0"
9099+
yargs-parser "^13.0.0"
9100+
90389101
yargs@^9.0.0:
90399102
version "9.0.1"
90409103
resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"

0 commit comments

Comments
 (0)