Skip to content

Commit a98751a

Browse files
louiszawadzkithibautguedou3
louiszawadzki
authored and
thibautguedou3
committed
fix(android): Use react-native-modalbox 1.7.1 for RN 0.58
1 parent ff6a3f0 commit a98751a

File tree

13 files changed

+2984
-211
lines changed

13 files changed

+2984
-211
lines changed

‎Example/.flowconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
6767
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
6868

6969
[version]
70-
^0.78.0
70+
^0.85.0

‎Example/android/app/BUCK‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,13 @@
88
# - `buck install -r android/app` - compile, install and run application
99
#
1010

11+
load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
12+
1113
lib_deps = []
1214

13-
for jarfile in glob(['libs/*.jar']):
14-
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
15-
lib_deps.append(':' + name)
16-
prebuilt_jar(
17-
name = name,
18-
binary_jar = jarfile,
19-
)
15+
create_aar_targets(glob(["libs/*.aar"]))
2016

21-
for aarfile in glob(['libs/*.aar']):
22-
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
23-
lib_deps.append(':' + name)
24-
android_prebuilt_aar(
25-
name = name,
26-
aar = aarfile,
27-
)
17+
create_jar_targets(glob(["libs/*.jar"]))
2818

2919
android_library(
3020
name = "all-libs",

‎Example/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ android {
112112
reset()
113113
enable enableSeparateBuildPerCPUArchitecture
114114
universalApk false // If true, also generate a universal APK
115-
include "armeabi-v7a", "x86"
115+
include "armeabi-v7a", "x86", "arm64-v8a"
116116
}
117117
}
118118
buildTypes {
@@ -126,7 +126,7 @@ android {
126126
variant.outputs.each { output ->
127127
// For each separate APK per architecture, set a unique version code as described here:
128128
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
129-
def versionCodes = ["armeabi-v7a":1, "x86":2]
129+
def versionCodes = ["armeabi-v7a":1, "x86":2, , "arm64-v8a": 3]
130130
def abi = output.getFilter(OutputFile.ABI)
131131
if (abi != null) { // null for the universal-debug, universal-release variants
132132
output.versionCodeOverride =

‎Example/android/app/build_defs.bzl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
"""Helper definitions to glob .aar and .jar targets"""
2+
3+
def create_aar_targets(aarfiles):
4+
for aarfile in aarfiles:
5+
name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
6+
lib_deps.append(":" + name)
7+
android_prebuilt_aar(
8+
name = name,
9+
aar = aarfile,
10+
)
11+
12+
def create_jar_targets(jarfiles):
13+
for jarfile in jarfiles:
14+
name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
15+
lib_deps.append(":" + name)
16+
prebuilt_jar(
17+
name = name,
18+
binary_jar = jarfile,
19+
)

‎Example/android/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "27.0.3"
5+
buildToolsVersion = "28.0.2"
66
minSdkVersion = 16
7-
compileSdkVersion = 27
8-
targetSdkVersion = 26
9-
supportLibVersion = "27.1.1"
7+
compileSdkVersion = 28
8+
targetSdkVersion = 27
9+
supportLibVersion = "28.0.0"
1010
}
1111
repositories {
1212
google()
1313
jcenter()
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:3.1.4'
16+
classpath 'com.android.tools.build:gradle:3.2.1'
1717

1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
@@ -34,6 +34,6 @@ allprojects {
3434

3535

3636
task wrapper(type: Wrapper) {
37-
gradleVersion = '4.4'
37+
gradleVersion = '4.9'
3838
distributionUrl = distributionUrl.replace("bin", "all")
3939
}

‎Example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

‎Example/ios/Example.xcodeproj/project.pbxproj‎

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
3939
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4040
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
41+
BF90FF66220B57E600B9C1D7 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF90FF65220B57E600B9C1D7 /* JavaScriptCore.framework */; };
4142
/* End PBXBuildFile section */
4243

4344
/* Begin PBXContainerItemProxy section */
@@ -174,20 +175,6 @@
174175
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
175176
remoteInfo = "double-conversion-tvOS";
176177
};
177-
2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = {
178-
isa = PBXContainerItemProxy;
179-
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
180-
proxyType = 2;
181-
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
182-
remoteInfo = privatedata;
183-
};
184-
2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = {
185-
isa = PBXContainerItemProxy;
186-
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
187-
proxyType = 2;
188-
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
189-
remoteInfo = "privatedata-tvOS";
190-
};
191178
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
192179
isa = PBXContainerItemProxy;
193180
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -265,20 +252,6 @@
265252
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
266253
remoteInfo = "cxxreact-tvOS";
267254
};
268-
3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
269-
isa = PBXContainerItemProxy;
270-
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
271-
proxyType = 2;
272-
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
273-
remoteInfo = jschelpers;
274-
};
275-
3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
276-
isa = PBXContainerItemProxy;
277-
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
278-
proxyType = 2;
279-
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
280-
remoteInfo = "jschelpers-tvOS";
281-
};
282255
5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
283256
isa = PBXContainerItemProxy;
284257
containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
@@ -314,6 +287,34 @@
314287
remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
315288
remoteInfo = RCTBlob;
316289
};
290+
BF90FF5D220B57DC00B9C1D7 /* PBXContainerItemProxy */ = {
291+
isa = PBXContainerItemProxy;
292+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
293+
proxyType = 2;
294+
remoteGlobalIDString = EDEBC6D6214B3E7000DD5AC8;
295+
remoteInfo = jsi;
296+
};
297+
BF90FF5F220B57DC00B9C1D7 /* PBXContainerItemProxy */ = {
298+
isa = PBXContainerItemProxy;
299+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
300+
proxyType = 2;
301+
remoteGlobalIDString = EDEBC73B214B45A300DD5AC8;
302+
remoteInfo = jsiexecutor;
303+
};
304+
BF90FF61220B57DC00B9C1D7 /* PBXContainerItemProxy */ = {
305+
isa = PBXContainerItemProxy;
306+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
307+
proxyType = 2;
308+
remoteGlobalIDString = ED296FB6214C9A0900B7C4FE;
309+
remoteInfo = "jsi-tvOS";
310+
};
311+
BF90FF63220B57DC00B9C1D7 /* PBXContainerItemProxy */ = {
312+
isa = PBXContainerItemProxy;
313+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
314+
proxyType = 2;
315+
remoteGlobalIDString = ED296FEE214C9CF800B7C4FE;
316+
remoteInfo = "jsiexecutor-tvOS";
317+
};
317318
/* End PBXContainerItemProxy section */
318319

319320
/* Begin PBXFileReference section */
@@ -343,6 +344,7 @@
343344
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
344345
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
345346
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
347+
BF90FF65220B57E600B9C1D7 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
346348
/* End PBXFileReference section */
347349

348350
/* Begin PBXFrameworksBuildPhase section */
@@ -358,6 +360,7 @@
358360
isa = PBXFrameworksBuildPhase;
359361
buildActionMask = 2147483647;
360362
files = (
363+
BF90FF66220B57E600B9C1D7 /* JavaScriptCore.framework in Frameworks */,
361364
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
362365
11D1A2F320CAFA9E000508D9 /* libRCTAnimation.a in Frameworks */,
363366
146834051AC3E58100842450 /* libReact.a in Frameworks */,
@@ -501,23 +504,24 @@
501504
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
502505
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
503506
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
504-
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
505-
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
506507
2DF0FFDF2056DD460020B375 /* libjsinspector.a */,
507508
2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */,
508509
2DF0FFE32056DD460020B375 /* libthird-party.a */,
509510
2DF0FFE52056DD460020B375 /* libthird-party.a */,
510511
2DF0FFE72056DD460020B375 /* libdouble-conversion.a */,
511512
2DF0FFE92056DD460020B375 /* libdouble-conversion.a */,
512-
2DF0FFEB2056DD460020B375 /* libprivatedata.a */,
513-
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */,
513+
BF90FF5E220B57DC00B9C1D7 /* libjsi.a */,
514+
BF90FF60220B57DC00B9C1D7 /* libjsiexecutor.a */,
515+
BF90FF62220B57DC00B9C1D7 /* libjsi-tvOS.a */,
516+
BF90FF64220B57DC00B9C1D7 /* libjsiexecutor-tvOS.a */,
514517
);
515518
name = Products;
516519
sourceTree = "<group>";
517520
};
518521
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
519522
isa = PBXGroup;
520523
children = (
524+
BF90FF65220B57E600B9C1D7 /* JavaScriptCore.framework */,
521525
2D16E6891FA4F8E400B85C8A /* libReact.a */,
522526
);
523527
name = Frameworks;
@@ -893,20 +897,6 @@
893897
remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */;
894898
sourceTree = BUILT_PRODUCTS_DIR;
895899
};
896-
2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = {
897-
isa = PBXReferenceProxy;
898-
fileType = archive.ar;
899-
path = libprivatedata.a;
900-
remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */;
901-
sourceTree = BUILT_PRODUCTS_DIR;
902-
};
903-
2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = {
904-
isa = PBXReferenceProxy;
905-
fileType = archive.ar;
906-
path = "libprivatedata-tvOS.a";
907-
remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */;
908-
sourceTree = BUILT_PRODUCTS_DIR;
909-
};
910900
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
911901
isa = PBXReferenceProxy;
912902
fileType = archive.ar;
@@ -984,20 +974,6 @@
984974
remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
985975
sourceTree = BUILT_PRODUCTS_DIR;
986976
};
987-
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
988-
isa = PBXReferenceProxy;
989-
fileType = archive.ar;
990-
path = libjschelpers.a;
991-
remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
992-
sourceTree = BUILT_PRODUCTS_DIR;
993-
};
994-
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
995-
isa = PBXReferenceProxy;
996-
fileType = archive.ar;
997-
path = libjschelpers.a;
998-
remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
999-
sourceTree = BUILT_PRODUCTS_DIR;
1000-
};
1001977
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
1002978
isa = PBXReferenceProxy;
1003979
fileType = archive.ar;
@@ -1033,6 +1009,34 @@
10331009
remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
10341010
sourceTree = BUILT_PRODUCTS_DIR;
10351011
};
1012+
BF90FF5E220B57DC00B9C1D7 /* libjsi.a */ = {
1013+
isa = PBXReferenceProxy;
1014+
fileType = archive.ar;
1015+
path = libjsi.a;
1016+
remoteRef = BF90FF5D220B57DC00B9C1D7 /* PBXContainerItemProxy */;
1017+
sourceTree = BUILT_PRODUCTS_DIR;
1018+
};
1019+
BF90FF60220B57DC00B9C1D7 /* libjsiexecutor.a */ = {
1020+
isa = PBXReferenceProxy;
1021+
fileType = archive.ar;
1022+
path = libjsiexecutor.a;
1023+
remoteRef = BF90FF5F220B57DC00B9C1D7 /* PBXContainerItemProxy */;
1024+
sourceTree = BUILT_PRODUCTS_DIR;
1025+
};
1026+
BF90FF62220B57DC00B9C1D7 /* libjsi-tvOS.a */ = {
1027+
isa = PBXReferenceProxy;
1028+
fileType = archive.ar;
1029+
path = "libjsi-tvOS.a";
1030+
remoteRef = BF90FF61220B57DC00B9C1D7 /* PBXContainerItemProxy */;
1031+
sourceTree = BUILT_PRODUCTS_DIR;
1032+
};
1033+
BF90FF64220B57DC00B9C1D7 /* libjsiexecutor-tvOS.a */ = {
1034+
isa = PBXReferenceProxy;
1035+
fileType = archive.ar;
1036+
path = "libjsiexecutor-tvOS.a";
1037+
remoteRef = BF90FF63220B57DC00B9C1D7 /* PBXContainerItemProxy */;
1038+
sourceTree = BUILT_PRODUCTS_DIR;
1039+
};
10361040
/* End PBXReferenceProxy section */
10371041

10381042
/* Begin PBXResourcesBuildPhase section */

‎Example/metro.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
"formik",
1616
"lodash",
1717
"recompose",
18-
"@bam.tech/react-native-modalbox",
18+
"react-native-modalbox",
1919
"react-native-root-siblings",
2020
"@babel/runtime"
2121
]

‎Example/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"test": "jest"
88
},
99
"dependencies": {
10-
"@bam.tech/react-native-modalbox": "^1.4.2",
11-
"react-native-root-siblings": "3.1.7",
1210
"date-fns": "^1.29.0",
1311
"formik": "^1.4.0",
1412
"lodash": "^4.17.11",
15-
"react": "16.6.1",
16-
"react-native": "0.57.7",
13+
"react": "16.6.3",
14+
"react-native": "0.58.3",
1715
"react-native-input-scroll-view": "^1.8.0",
1816
"react-native-keyboard-spacer": "^0.4.1",
1917
"react-native-material-textfield": "^0.12.0",
2018
"react-native-modal-datetime-picker": "^6.0.0",
19+
"react-native-modalbox": "^1.7.1",
20+
"react-native-root-siblings": "3.1.7",
2121
"recompose": "^0.30.0",
2222
"yup": "^0.26.6"
2323
},

0 commit comments

Comments
 (0)