Skip to content

Commit 487d718

Browse files
committed
Upgrade example modules
1 parent 099702b commit 487d718

File tree

8 files changed

+28
-18
lines changed

8 files changed

+28
-18
lines changed

detox/test/android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ dependencies {
9090
implementation 'com.android.support:appcompat-v7:28.0.0'
9191
}
9292

93-
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
94-
9593
fromSourceImplementation(project(path: ':ReactAndroid'))
9694
// noinspection GradleDynamicVersion
9795
fromBinImplementation 'com.facebook.react:react-native:+'

detox/test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"dependencies": {
3333
"moment": "^2.24.0",
34-
"react": "16.11.0",
34+
"react": "16.11.x",
3535
"react-native": "0.62.x"
3636
},
3737
"devDependencies": {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
let metroBundler;
1+
let createBlacklist;
22
try {
3-
metroBundler = require('metro');
3+
createBlacklist = require('metro-config/src/defaults/blacklist');
44
} catch (ex) {
5-
metroBundler = require('metro-bundler');
5+
createBlacklist = require('metro-bundler').createBlacklist;
66
}
77

88
module.exports = {
9-
getBlacklistRE: function() {
10-
return metroBundler.createBlacklist([/test\/.*/, /detox\/node_modules\/.*/]);
11-
}
9+
resolver: {
10+
blacklistRE: createBlacklist([/test\/.*/, /detox\/node_modules\/.*/]),
11+
},
1212
};

examples/demo-react-native/android/app/proguard-rules.pro

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,14 @@
1414
-dontnote sun.misc.Unsafe
1515
-dontnote okhttp3.**
1616
-dontnote okio.**
17+
18+
# Do not strip any method/class that is annotated with @DoNotStrip
19+
-keep @com.facebook.jni.annotations.DoNotStrip class *
20+
-keep class * {
21+
@com.facebook.proguard.annotations.DoNotStrip *;
22+
@com.facebook.common.internal.DoNotStrip *;
23+
@com.facebook.jni.annotations.DoNotStrip *;
24+
}
25+
-keepclassmembers class * {
26+
@com.facebook.jni.annotations.DoNotStrip *;
27+
}

examples/demo-react-native/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
google()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:3.4.2'
15+
classpath 'com.android.tools.build:gradle:3.5.2'
1616
classpath 'de.undercouch:gradle-download-task:3.4.3'
1717
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1818
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Sep 15 22:51:43 IDT 2019
1+
#Sun Apr 05 21:47:34 IDT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
let metroBundler;
1+
let createBlacklist;
22
try {
3-
metroBundler = require('metro');
3+
createBlacklist = require('metro-config/src/defaults/blacklist');
44
} catch (ex) {
5-
metroBundler = require('metro-bundler');
5+
createBlacklist = require('metro-bundler').createBlacklist;
66
}
7+
78
module.exports = {
89
resolver: {
9-
blacklistRE: metroBundler.createBlacklist([/test\/.*/, /detox\/node_modules\/.*/]),
10+
blacklistRE: createBlacklist([/test\/.*/, /detox\/node_modules\/.*/]),
1011
},
1112
};

examples/demo-react-native/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"e2e:android-release": "npm run build:android-release && npm run test:android-release"
2020
},
2121
"dependencies": {
22-
"react": "16.8.x",
23-
"react-native": "0.60.x"
22+
"react": "16.11.x",
23+
"react-native": "0.62.x"
2424
},
2525
"devDependencies": {
2626
"detox": "^16.1.1",

0 commit comments

Comments
 (0)