Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit 3919c0b

Browse files
yusintoyusinto
authored
fix: startup release build crash (#151)
* fix: startup crash due to missing proguard file * Add Todd to codeowners * update pods * add separate android-release command --------- Co-authored-by: Yusinto Ngadiman <[email protected]>
1 parent f278be3 commit 3919c0b

File tree

10 files changed

+4796
-5280
lines changed

10 files changed

+4796
-5280
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ buck-out/
4747

4848
# Auto-generated
4949
test-types.js
50+
51+
.env

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @kinyoklion @yusinto @louis-launchdarkly
1+
* @kinyoklion @yusinto @louis-launchdarkly @tanderson-ld

‎ManualTestApp/App.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const App = () => {
155155
};
156156

157157
MessageQueue.spy((msg) => {
158-
if (msg.module != 'LaunchdarklyReactNativeClient' && !msg.method.includes('LaunchdarklyReactNativeClient')) {
158+
if (msg.module != 'LaunchdarklyReactNativeClient' && !msg.method.includes?.('LaunchdarklyReactNativeClient')) {
159159
return;
160160
}
161161
let logMsg = msg.type === 0 ? 'N->JS: ' : 'JS->N: ';

‎ManualTestApp/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def enableSeparateBuildPerCPUArchitecture = false
9696
/**
9797
* Run Proguard to shrink the Java bytecode in release builds.
9898
*/
99-
def enableProguardInReleaseBuilds = false
99+
def enableProguardInReleaseBuilds = true
100100

101101
/**
102102
* The preferred build flavor of JavaScriptCore.

‎ManualTestApp/ios/ManualTestApp.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0B6DA8F6F65AE4D7745E7034 /* libPods-ManualTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81200BDA804265B7051B34CC /* libPods-ManualTestApp.a */; };
1110
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
1211
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1312
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1413
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
14+
9F64DC53C2D68F9B3AB60EE6 /* libPods-ManualTestApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 544FEEAABDF243BD76344B6B /* libPods-ManualTestApp.a */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18-
00A7AA1002E7C0727A14294F /* Pods-ManualTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.debug.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.debug.xcconfig"; sourceTree = "<group>"; };
1918
13B07F961A680F5B00A75B9A /* ManualTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManualTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
2019
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ManualTestApp/AppDelegate.h; sourceTree = "<group>"; };
2120
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ManualTestApp/AppDelegate.m; sourceTree = "<group>"; };
2221
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ManualTestApp/Images.xcassets; sourceTree = "<group>"; };
2322
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ManualTestApp/Info.plist; sourceTree = "<group>"; };
2423
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ManualTestApp/main.m; sourceTree = "<group>"; };
25-
367486A52C9EE5715002F16D /* Pods-ManualTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.release.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.release.xcconfig"; sourceTree = "<group>"; };
26-
81200BDA804265B7051B34CC /* libPods-ManualTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ManualTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
24+
413F0DAD97CBDFD63CB5428E /* Pods-ManualTestApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.release.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.release.xcconfig"; sourceTree = "<group>"; };
25+
544FEEAABDF243BD76344B6B /* libPods-ManualTestApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ManualTestApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
26+
5D6B4A193FDCD203289F2ACC /* Pods-ManualTestApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ManualTestApp.debug.xcconfig"; path = "Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp.debug.xcconfig"; sourceTree = "<group>"; };
2727
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ManualTestApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
2828
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
2929
/* End PBXFileReference section */
@@ -33,7 +33,7 @@
3333
isa = PBXFrameworksBuildPhase;
3434
buildActionMask = 2147483647;
3535
files = (
36-
0B6DA8F6F65AE4D7745E7034 /* libPods-ManualTestApp.a in Frameworks */,
36+
9F64DC53C2D68F9B3AB60EE6 /* libPods-ManualTestApp.a in Frameworks */,
3737
);
3838
runOnlyForDeploymentPostprocessing = 0;
3939
};
@@ -57,7 +57,7 @@
5757
isa = PBXGroup;
5858
children = (
5959
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
60-
81200BDA804265B7051B34CC /* libPods-ManualTestApp.a */,
60+
544FEEAABDF243BD76344B6B /* libPods-ManualTestApp.a */,
6161
);
6262
name = Frameworks;
6363
sourceTree = "<group>";
@@ -76,7 +76,7 @@
7676
832341AE1AAA6A7D00B99B32 /* Libraries */,
7777
83CBBA001A601CBA00E9B192 /* Products */,
7878
2D16E6871FA4F8E400B85C8A /* Frameworks */,
79-
9D0815E89C722EA13B9E1945 /* Pods */,
79+
E33A234FA9A50B8FE1696031 /* Pods */,
8080
);
8181
indentWidth = 2;
8282
sourceTree = "<group>";
@@ -91,11 +91,11 @@
9191
name = Products;
9292
sourceTree = "<group>";
9393
};
94-
9D0815E89C722EA13B9E1945 /* Pods */ = {
94+
E33A234FA9A50B8FE1696031 /* Pods */ = {
9595
isa = PBXGroup;
9696
children = (
97-
00A7AA1002E7C0727A14294F /* Pods-ManualTestApp.debug.xcconfig */,
98-
367486A52C9EE5715002F16D /* Pods-ManualTestApp.release.xcconfig */,
97+
5D6B4A193FDCD203289F2ACC /* Pods-ManualTestApp.debug.xcconfig */,
98+
413F0DAD97CBDFD63CB5428E /* Pods-ManualTestApp.release.xcconfig */,
9999
);
100100
name = Pods;
101101
path = Pods;
@@ -108,14 +108,14 @@
108108
isa = PBXNativeTarget;
109109
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ManualTestApp" */;
110110
buildPhases = (
111-
29C8EAF979C4977396E87B90 /* [CP] Check Pods Manifest.lock */,
111+
2E9942E89D266C5776B1946A /* [CP] Check Pods Manifest.lock */,
112112
FD10A7F022414F080027D42C /* Start Packager */,
113113
13B07F871A680F5B00A75B9A /* Sources */,
114114
13B07F8C1A680F5B00A75B9A /* Frameworks */,
115115
13B07F8E1A680F5B00A75B9A /* Resources */,
116116
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
117-
AB81F03A081597AC6649A97F /* [CP] Embed Pods Frameworks */,
118-
71BC63C17D964AF72F12BA7C /* [CP] Copy Pods Resources */,
117+
A5FCD3EC7EBE5ED6EC3237EF /* [CP] Embed Pods Frameworks */,
118+
A98083D56B2D93B219C1CF45 /* [CP] Copy Pods Resources */,
119119
);
120120
buildRules = (
121121
);
@@ -184,7 +184,7 @@
184184
shellPath = /bin/sh;
185185
shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
186186
};
187-
29C8EAF979C4977396E87B90 /* [CP] Check Pods Manifest.lock */ = {
187+
2E9942E89D266C5776B1946A /* [CP] Check Pods Manifest.lock */ = {
188188
isa = PBXShellScriptBuildPhase;
189189
buildActionMask = 2147483647;
190190
files = (
@@ -206,38 +206,38 @@
206206
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
207207
showEnvVarsInLog = 0;
208208
};
209-
71BC63C17D964AF72F12BA7C /* [CP] Copy Pods Resources */ = {
209+
A5FCD3EC7EBE5ED6EC3237EF /* [CP] Embed Pods Frameworks */ = {
210210
isa = PBXShellScriptBuildPhase;
211211
buildActionMask = 2147483647;
212212
files = (
213213
);
214214
inputFileListPaths = (
215-
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-input-files.xcfilelist",
215+
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
216216
);
217-
name = "[CP] Copy Pods Resources";
217+
name = "[CP] Embed Pods Frameworks";
218218
outputFileListPaths = (
219-
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-output-files.xcfilelist",
219+
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
220220
);
221221
runOnlyForDeploymentPostprocessing = 0;
222222
shellPath = /bin/sh;
223-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources.sh\"\n";
223+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks.sh\"\n";
224224
showEnvVarsInLog = 0;
225225
};
226-
AB81F03A081597AC6649A97F /* [CP] Embed Pods Frameworks */ = {
226+
A98083D56B2D93B219C1CF45 /* [CP] Copy Pods Resources */ = {
227227
isa = PBXShellScriptBuildPhase;
228228
buildActionMask = 2147483647;
229229
files = (
230230
);
231231
inputFileListPaths = (
232-
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
232+
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-input-files.xcfilelist",
233233
);
234-
name = "[CP] Embed Pods Frameworks";
234+
name = "[CP] Copy Pods Resources";
235235
outputFileListPaths = (
236-
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
236+
"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources-${CONFIGURATION}-output-files.xcfilelist",
237237
);
238238
runOnlyForDeploymentPostprocessing = 0;
239239
shellPath = /bin/sh;
240-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-frameworks.sh\"\n";
240+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ManualTestApp/Pods-ManualTestApp-resources.sh\"\n";
241241
showEnvVarsInLog = 0;
242242
};
243243
FD10A7F022414F080027D42C /* Start Packager */ = {
@@ -276,7 +276,7 @@
276276
/* Begin XCBuildConfiguration section */
277277
13B07F941A680F5B00A75B9A /* Debug */ = {
278278
isa = XCBuildConfiguration;
279-
baseConfigurationReference = 00A7AA1002E7C0727A14294F /* Pods-ManualTestApp.debug.xcconfig */;
279+
baseConfigurationReference = 5D6B4A193FDCD203289F2ACC /* Pods-ManualTestApp.debug.xcconfig */;
280280
buildSettings = {
281281
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
282282
CLANG_ENABLE_MODULES = YES;
@@ -302,7 +302,7 @@
302302
};
303303
13B07F951A680F5B00A75B9A /* Release */ = {
304304
isa = XCBuildConfiguration;
305-
baseConfigurationReference = 367486A52C9EE5715002F16D /* Pods-ManualTestApp.release.xcconfig */;
305+
baseConfigurationReference = 413F0DAD97CBDFD63CB5428E /* Pods-ManualTestApp.release.xcconfig */;
306306
buildSettings = {
307307
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
308308
CLANG_ENABLE_MODULES = YES;

‎ManualTestApp/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ PODS:
7474
- glog (0.3.5)
7575
- LaunchDarkly (7.1.0):
7676
- LaunchDarkly/Core (= 7.1.0)
77-
- launchdarkly-react-native-client-sdk (6.3.0):
77+
- launchdarkly-react-native-client-sdk (6.3.2):
7878
- LaunchDarkly (= 7.1.0)
7979
- React-Core
8080
- LaunchDarkly/Core (7.1.0):
@@ -512,7 +512,7 @@ SPEC CHECKSUMS:
512512
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
513513
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
514514
LaunchDarkly: 31da8b77e96cb744417208478bb5b24f35fd2491
515-
launchdarkly-react-native-client-sdk: ddc05ffeba2a99393cec290528f044025a1d12c9
515+
launchdarkly-react-native-client-sdk: 8831d9860f68d56b60c3fc2c81b97b7bac2a92fa
516516
LDSwiftEventSource: 824ce51a4fa8e79498c9b67ae672bfa802bd7464
517517
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
518518
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b

‎ManualTestApp/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
"private": true,
55
"scripts": {
66
"android": "react-native run-android",
7+
"android-release": "react-native run-android --variant release",
78
"ios": "react-native run-ios",
89
"start": "react-native start",
910
"postinstall": "cd ../ && yarn link-dev",
1011
"lint": "eslint ."
1112
},
1213
"dependencies": {
1314
"@react-native-picker/picker": "^2.2.1",
14-
"launchdarkly-react-native-client-sdk": "^6.2.4",
15+
"launchdarkly-react-native-client-sdk": "^6.3.2",
1516
"react": "17.0.2",
1617
"react-native": "0.67.2"
1718
},

‎ManualTestApp/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,10 +3244,10 @@ kleur@^3.0.3:
32443244
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
32453245
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
32463246

3247-
launchdarkly-react-native-client-sdk@^6.2.4:
3248-
version "6.2.4"
3249-
resolved "https://registry.yarnpkg.com/launchdarkly-react-native-client-sdk/-/launchdarkly-react-native-client-sdk-6.2.4.tgz#ac2ddc009407f815dfdc33703604e9b82bd9160d"
3250-
integrity sha512-emD7AnyS0qYF4ZkbLeBQi0lAjwvlj6Am+VVTtMvrXK8jPHPRLVW+vcosU93s8vD9LZlvLpBjPsWyFSgGpF1THQ==
3247+
launchdarkly-react-native-client-sdk@^6.3.2:
3248+
version "6.3.2"
3249+
resolved "https://registry.yarnpkg.com/launchdarkly-react-native-client-sdk/-/launchdarkly-react-native-client-sdk-6.3.2.tgz#3c8a8ee4d0f60eb08b48ecd2aaa501b361ded6ac"
3250+
integrity sha512-cDG4dDL3jrLTS9iPI04ydrXogtDlE/5jZmHtD0bf2z6uo3VFav+hMU1p+2CKJ/Q8PWd5YGFI2Ra7zUjmtXoY4w==
32513251

32523252
leven@^3.1.0:
32533253
version "3.1.0"

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"files": [
88
"android/src/main",
99
"android/build.gradle",
10+
"android/consumer-proguard-rules.pro",
1011
"android/gradle.properties",
1112
"ios/LaunchdarklyReactNativeClient.xcodeproj",
1213
"ios/LaunchdarklyReactNativeClient.swift",

0 commit comments

Comments
 (0)