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

Commit 5f3be70

Browse files
LaunchDarklyReleaseBotbwoskow-ldtorchhoundorthancgwhelanLD
authored
prepare 6.3.0 release (#171)
* Removed the guides link * V4.0 (#68) * Update to iOS 5.4.0 (#48) * Bump iOS SDK version to 5.4.0 * Replace shared with get() * Replace old method names * Provide default values for EvaluationDetail * Fixed defaultValue for detail value * Changed individual nil coalesce to NSNull * Remove isDisableBackgroundPolling method (#52) * Update iOS base url (#49) * Update iOS base url * Added wrapper name and version to iOS and Android config (#50) * Added wrapper name and version to iOS and Android config * V4 not 5 * Rename wrapper * Add getVersion method (#51) * Added getVersion method * Revert package.json version bump * Fix version case Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> * Rename fallback to defaultValue (#53) * Rename fallback to defaultValue * Fix awkward wording defaultValue value * Fix defaultValue value line breaks * Improved resiliency when running in Android (#54) * Add new config values (#55) * Added new config values to iOS and Android * Added typescript config * PR feedback * Fix millis, add default doc * fix common build + add tests for recent introductions (#56) * fix: start background thread for identify rather than running it (#66) * Bump Android SDK version to 2.14.1 (#59) * Update Android to 2.14.1, change setBaseUri to setPollUri, change floatVariation to doubleVariation * Fix float to double * Doublevalue on non detail * Run CI against v4.0 * URL fix iOS * Add isInitialized to iOS, check initialization in configure (#60) * Added isInitialized to iOS * Add init check to configure * Base url iOS fix, v4.0 ci * Var not func iOS, remove getMap * disable auto-alias in iOS (#61) * Add configureWithTimeout method (#58) * Added configureTimeout method * Fix timeout type on iOS * Simplify timeout nil check * Added param labels, Java syntax fixes * Small fixes * Make timeout final * Remove unnecessary catch * Fix baseUrl * Fix Android config error * Test against v4.0 hello branch * Fix tests * timeout never nil inside check * Convert Int to TimeInterval * Fixed iOS startWaitSeconds * Catch LDException * Fix merge conflict in iOS bridge * Fix merge conflict in index.js * PR feedback * Fix unused timeoutClient * Remove unnecessary ConfigEntryType * Remove StringSet * If let in timeout check * Configure method now takes optional timeout parameter instead of separate method * Renames for consistency (#62) * up-leveling the override for the default polling uri so it affects android too (#63) * Added ip, avatar, and allUserAttributesPrivate (#57) * Added ip, avatar, and allUserAttributesPrivate * Updated test-types.ts, fix case typo * Special case allUserAttributesPrivate * Fix ReadableMap loading of all private * CI fix * Fix string to URL baseUrl * Change to non-default values in test, combine lines in config.yml * Simplify allAttrsPrivate if * resolve breakage with latest merge Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> * Added accessor methods for ConnectionInformation (#64) * Added ConnectionInformation accessors * Fixes from manual testing * PR feedback * Fix allUserAttributesPrivate * Improve typescript docs * Minor fixes (#66) Fixes `floatVariation` to keep double precision and fix build warnings. * Fix track metricValue on iOS (#67) * Remove CI checkout for release Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ed Costello <orthanc@users.noreply.github.com> Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> Co-authored-by: Gavin Whelan <gwhelan@launchdarkly.com> * Update iOS SDK dependency to fix Throttler behavior (#69) * V4.1.0 (#72) * Bump react native to 0.64 (#70) * Remove unnecessary React peer dependency (#71) * Fixed jsonVariationDetail parsing on Android and fixed a typo in jsonVariationDetailNone (#73) * Releasing version 4.0.2 * Removes Typescript enums and replaces them with types that extend string (#74) * Added ts flag for testing * Testing bwoskow typescript enum patch * Remove todo * Releasing version 4.0.3 * Multi Environment (#65) * Update to iOS 5.4.0 (#48) * Bump iOS SDK version to 5.4.0 * Replace shared with get() * Replace old method names * Provide default values for EvaluationDetail * Fixed defaultValue for detail value * Changed individual nil coalesce to NSNull * Remove isDisableBackgroundPolling method (#52) * Update iOS base url (#49) * Update iOS base url * Add protocol * Added wrapper name and version to iOS and Android config (#50) * Added wrapper name and version to iOS and Android config * V4 not 5 * Rename wrapper * Add getVersion method (#51) * Added getVersion method * Revert package.json version bump * Fix version case * Fix minor PR feedback * Update index.d.ts Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> * Rename fallback to defaultValue (#53) * Rename fallback to defaultValue * Fix awkward wording defaultValue value * Fix defaultValue value line breaks * Improved resiliency when running in Android (#54) * Add new config values (#55) * Added new config values to iOS and Android * Added typescript config * PR feedback * Fix millis, add default doc * fix common build + add tests for recent introductions (#56) * Added secondaryMobileKeys and getForMobileKey * Added primaryEnvironmentName constant * Fix Android build errors * Fix build errors * Fix Android config error * CI test fixes * Catch LD exception without crashing * fix: start background thread for identify rather than running it (#66) * Bump Android SDK version to 2.14.1 (#59) * Update Android to 2.14.1, change setBaseUri to setPollUri, change floatVariation to doubleVariation * Fix float to double * Doublevalue on non detail * Run CI against v4.0 * URL fix iOS * Add isInitialized to iOS, check initialization in configure (#60) * Added isInitialized to iOS * Add init check to configure * Base url iOS fix, v4.0 ci * Var not func iOS, remove getMap * disable auto-alias in iOS (#61) * Add configureWithTimeout method (#58) * Added configureTimeout method * Fix timeout type on iOS * Simplify timeout nil check * Added param labels, Java syntax fixes * Small fixes * Make timeout final * Remove unnecessary catch * Fix baseUrl * Fix Android config error * Test against v4.0 hello branch * Fix tests * timeout never nil inside check * Convert Int to TimeInterval * Fixed iOS startWaitSeconds * Catch LDException * Fix merge conflict in iOS bridge * Fix merge conflict in index.js * PR feedback * Fix unused timeoutClient * Remove unnecessary ConfigEntryType * Remove StringSet * If let in timeout check * Configure method now takes optional timeout parameter instead of separate method * Renames for consistency (#62) * up-leveling the override for the default polling uri so it affects android too (#63) * Added ip, avatar, and allUserAttributesPrivate (#57) * Added ip, avatar, and allUserAttributesPrivate * Updated test-types.ts, fix case typo * Special case allUserAttributesPrivate * Fix ReadableMap loading of all private * CI fix * Fix string to URL baseUrl * Change to non-default values in test, combine lines in config.yml * Simplify allAttrsPrivate if * resolve breakage with latest merge Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> * Multi environment works in Android, fixed bad config type * Fix allUserAttributesPrivate * Fix typescript test * No StringSet for wrapper, change to ldClient for isInitialized * Forgot nil check * environment param * Select environment via method parameter * Check for environment undefined in JS * iOS error fixes * Fix iOS bridge, add missing param and try to Android * Remove v4.0 branch hello rn for CI * Fixed all flags and better long conversion * A bunch of let to const, change default to test in multi env ts test, remove ldClient var from iOS * Remove internal comments from Android * Added back 2 Android comments, Double to NSNumber reversion, var to let reversion, ternary to function * Get default environment name from underlying SDKs * Cast NSNumber to Double to fix compilation error * getVersion public, remove ldClient from Android * Use get() * Remove unnecessary get() * Try instead of null check * as! Double to doubleValue, toIntExact to intValue, change Android env name, improve try * Fix listeners in multiple environments, change continue to comment in Android try/catch init * Add semicolon in between environment and flagKey or listenerId string concat * Environment concatenation function * Swift param labels * Added self, remove conditional cast to Any * Remove unnecessary nil coalescing * Capitalize ldClient * getForMobileKey Android * Removed unnecessary try, added final keyword * Revert some nonnull and Double types * Inline primaryEnvironmentName iOS Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> * Add secondary user attribute (#76) * Fix multi environment on restwrapper (#77) * remove platform specific default env name * Replace function with ternary * Remove _getEnvironment * [ch109800] Await Android client initialization. (#78) Handle promise from `isInitialized` during configuration. Update iOS `isInitialized` to reject when not configured to match Android implementation. Improve Android `allFlags` to reject promise when non-existent environment is used or other exception, and allow calling `allFlags` before client initialization completes. * Update iOS method signature to match implementation (#79) * Releasing version 4.0.4 * [ch110474] Fixes for undeclared variables and other callback issues. (#81) * Changes for Android 3. (#82) * Add unit tests for JS native bridge wrapper. (#83) * Docs improvements (#84) * [ch94513] Add aliasing support (#85) * Requiring default values to be specified. Remove intVariation. (#86) * Safer and cleaner configuration on iOS (#87) * Cleanup Android variation implementation (#88) * Use latest iOS and Android SDKs (#89) * Fix issue with numeric variation calls. (#90) * Add consumer Proguard file to Android build configuration. (#91) * Update Android SDK to 3.1.1 (#92) * Fix for absolute paths in cocoapods generated build files by running pod install in CI. (#93) * Re-introduce compatibility for React Native 0.63 (#94) * Updates docs URLs * Add configuration option `inlineUsersInEvents` and typescript definition for `autoAliasingOptOut`. (#96) * minor doc improvement (#97) * Update version in README to match what version we'll actually be releasing with (#98) * Invert isOffline on iOS. (#99) * Fixes and improvements for CI configuration (#100) * [SC-130395] Allow native SDKs to generate anonymous user when user key is not provided. (#101) * See will this work without adding the mavenCentral * Adding MavenCentral * Fix RN0.63 builds * Fix outdated sed CI expression preventing actually testing against the current SDK version correctly (#103) * Update Android native SDK dependency and gradle config. (#104) * Update iOS SDK native dependency in podspec. (#105) * [sc-139041] Fix releaser typedoc generation (#106) * Have podspec retrieve version from package.json to allow using default releaser version script. (#107) * Fix iOS jsonVariation and jsonVariationDetail when using array default value. (#108) * Completely rework CI build to not use hello-react-native (#109) * Include manual testing application in repo (#110) * Adding the addListener and removeListeners method to silence the warning * Add privateAttributeNames to TypeScript and iOS wrapper implementation. (#112) * Bump to latest Android SDK release (#114) * Fix ownership handling for all flags and connection mode listeners on iOS. (#113) * Update iOS SDK to latest 5.4.5 release. (#115) * Update Android SDK to latest patch release. (#116) * Update to the correct variation method * Add RN 0.68 CI and expand RN version bounds in package definition. (#117) * Update supported RN versions in readme. * [sc-149512] Android reason fixes (#120) * Changes for iOS V6. (#122) * Use iOS 6.1.0 and new `LDUser.isAnonymousNullable` property (#123) * Fix automatically setting user as anonymous when both key and anonymous are unspecified (#124) * Add the new React Native version and the latest non-beta xcode version * Add exclusion to the old RN with new xcode and new RN with old xcode * Update the Readme * Update package files * RN 0.69.1 is available * Code Review Comment to remove xcode 12.2 * Try to install jest first to get past the error * Try to pin the RN version when using with npx * Bump Android SDK to 3.1.6 * Print more about circle CI * Use a separate working director for the new project * Update the relative path * CircleCI need to have -p for mkdir * Upgrade Native Android SDK to 3.1.7 * Try to bump Android SDK to 3.2.0 * The null check logic for isInitialized * Fix spacing * Support React Native 0.70. (#129) * Add RN 0.70.1 and Xcode 14.0.1 to the CircleCI test config * Add the exclusion for RN 0.64 and 0.65 for Xcode 14.0.1 * More update to the Android isInitialized logic (#130) * Revert the isInitialized change and fix package.json (#131) * Initial commit * Update README.md * yarn inside test app as well initially * Create CODEOWNERS * Add jcenter as repo source to solve unknown facebook imports. Remove redundant yarn install. * Update to gradle 7.2 * Remove lock files and ignore them * Update README.md * Revert "Remove lock files and ignore them" This reverts commit 7ea62cd. * Added react-native to dev dep to fix jest failing to run due to some rn version issue. * Attempt to fix android 0.64 minCompileSdk build error * Rollback jcenter and resolution changes * Increase compile version to fix rn 0.64.3 build errors * Update config.yml * Rollback to main version * Initial commit * Update .prettierrc.js * Prettify code * Ran prettier on js and json files * Update App.js * Update ios sdk version * Disable autoCaps * Corrected autoCapitalize from false to none * Update App.js * Fixed bug where podspec and LICENCE files are not copied to test app's node modules * Create lefthook.yml * Added ios ApplicationInfo support. Split modd file. Update ios sdk version. * Update LaunchdarklyReactNativeClient.swift * Create modd-ios.conf * Split modd configs into ios and android. Update readme. * Update LaunchdarklyReactNativeClient.swift * Fix bug where version is incorrectly set * Delete lefthook.yml * Bumped min ios deployment target * Rolled bak xcode proj change and set min ios sdk version in podspec * Update project.pbxproj * Hack template Podfile to support minimum ios 11 * More ios 11 patch hacks * Update config.yml * Hack 0.64.x build.gradle to use minSdkVersion 30 * Update config.yml * Force rn android binaries to be downloaded from facebook. Update gradle. * Remove accidentally committed yarn.lock. Update manual test app's gradle versions. * Hack circleci config to speed up build * Update build.gradle * Update build.gradle * Update build.gradle * Update config.yml * Restore circleci config, updating 0.64.3 to 0.64.4 * Update config.yml * Create modd.conf * Added Application types --------- Co-authored-by: Ben Woskow <48036130+bwoskow-ld@users.noreply.github.com> Co-authored-by: Joe Cieslik <5600929+torchhound@users.noreply.github.com> Co-authored-by: Ed Costello <orthanc@users.noreply.github.com> Co-authored-by: Ben Woskow <bwoskow@launchdarkly.com> Co-authored-by: Gavin Whelan <gwhelan@launchdarkly.com> Co-authored-by: LaunchDarklyCI <dev@launchdarkly.com> Co-authored-by: LaunchDarklyReleaseBot <launchdarklyreleasebot@launchdarkly.com> Co-authored-by: Ember Stevens <ember.stevens@launchdarkly.com> Co-authored-by: ember-stevens <79482775+ember-stevens@users.noreply.github.com> Co-authored-by: Louis Chan <lchan@launchdarkly.com> Co-authored-by: Louis Chan <91093020+louis-launchdarkly@users.noreply.github.com> Co-authored-by: Yusinto Ngadiman <yusinto@gmail.com> Co-authored-by: Yusinto Ngadiman <yus@launchdarkly.com>
1 parent f5d38f6 commit 5f3be70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+10365
-3577
lines changed

.circleci/config.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,16 @@ jobs:
4949
mkdir -p test
5050
cd test
5151
[ -d "CITest" ] || npx react-native@<<parameters.rn-version>> init CITest --version <<parameters.rn-version>> --skip-install
52+
53+
# HACK: rn 0.64.x init the test project targeting ios 10, which is incompatible with the ios SDK which requires
54+
# a minimum of ios 11
55+
sed -i.bak "s/platform :ios, '10.0'/platform :ios, '11.0'/" CITest/ios/Podfile
56+
sed -i.bak "s/IPHONEOS_DEPLOYMENT_TARGET = 10.0;/IPHONEOS_DEPLOYMENT_TARGET = 11.0;/" CITest/ios/CITest.xcodeproj/project.pbxproj
57+
58+
#HACK: force rn android 0.64.x init to use minSdkVersion 30 to pass the build
59+
sed -i.bak 's/buildToolsVersion = "29.0.3"/buildToolsVersion = "30.0.2"/' CITest/android/build.gradle
60+
sed -i.bak "s/compileSdkVersion = 29/compileSdkVersion = 31/" CITest/android/build.gradle
61+
sed -i.bak "s/targetSdkVersion = 29/targetSdkVersion = 31/" CITest/android/build.gradle
5262
5363
- save_cache:
5464
name: Save RN project template to cache
@@ -141,12 +151,12 @@ workflows:
141151
name: rn<<matrix.rn-version>>-xc<<matrix.xcode-version>>-build-apps-using-template
142152
matrix:
143153
parameters:
144-
rn-version: ["0.64.3", "0.65.2", "0.66.4", "0.67.3", "0.68.0","0.69.4", "0.70.1"]
145-
xcode-version: ["12.5.1", "13.2.1", "13.4.1", "14.0.1"]
154+
rn-version: [ "0.64.4", "0.65.2", "0.66.4", "0.67.3", "0.68.0","0.69.4", "0.70.1" ]
155+
xcode-version: [ "12.5.1", "13.2.1", "13.4.1", "14.0.1" ]
146156
exclude:
147-
- rn-version: "0.64.3"
157+
- rn-version: "0.64.4"
148158
xcode-version: "13.4.1"
149-
- rn-version: "0.64.3"
159+
- rn-version: "0.64.4"
150160
xcode-version: "14.0.1"
151161
- rn-version: "0.65.2"
152162
xcode-version: "13.4.1"

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all",
4+
"printWidth": 120,
5+
"arrowParens": "always"
6+
}

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @kinyoklion @yusinto @louis-launchdarkly

ManualTestApp/.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all",
4+
"printWidth": 120,
5+
"arrowParens": "always"
6+
}

ManualTestApp/.prettierrc.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

ManualTestApp/App.js

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
11
import React, { useState, useEffect } from 'react';
2-
import { SafeAreaView,
3-
ScrollView,
4-
StyleSheet,
5-
Text,
6-
View,
7-
Button,
8-
TextInput,
9-
Alert,
10-
Switch,
11-
} from 'react-native';
2+
import { SafeAreaView, ScrollView, StyleSheet, Text, View, Button, TextInput, Alert, Switch } from 'react-native';
123
import { Picker } from '@react-native-picker/picker';
134
import LDClient from 'launchdarkly-react-native-client-sdk';
145
import MessageQueue from 'react-native/Libraries/BatchedBridge/MessageQueue.js';
156

16-
const Wrapper = ({children}): Node => {
7+
const Wrapper = ({ children }): Node => {
178
const styles = {
189
scroll: { backgroundColor: '#fff', padding: 10 },
1910
area: { backgroundColor: '#fff', flex: 1 },
2011
};
2112
return (
2213
<SafeAreaView style={styles.area}>
23-
<ScrollView style={styles.scroll}>
24-
{children}
25-
</ScrollView>
14+
<ScrollView style={styles.scroll}>{children}</ScrollView>
2615
</SafeAreaView>
2716
);
28-
}
17+
};
2918

3019
const Body = () => {
3120
const [client, setClient] = useState(null);
@@ -42,6 +31,10 @@ const Body = () => {
4231
let config = {
4332
mobileKey: 'MOBILE_KEY',
4433
debugMode: true,
34+
application: {
35+
id: 'rn-manual-test-app',
36+
version: '0.0.1',
37+
},
4538
};
4639
let user = { key: userKey };
4740
try {
@@ -70,32 +63,34 @@ const Body = () => {
7063
}
7164

7265
Alert.alert('LD Server Response', JSON.stringify(res));
73-
}
66+
};
7467

7568
const track = () => {
7669
client.track(flagKey, false);
77-
}
70+
};
7871

7972
const identify = () => {
8073
client.identify({ key: userKey });
81-
}
74+
};
8275

8376
const listen = () => {
8477
if (listeners.hasOwnProperty(listenerKey)) {
8578
return;
8679
}
87-
let listener = value => Alert.alert('Listener Callback', value);
80+
let listener = (value) => Alert.alert('Listener Callback', value);
8881
client.registerFeatureFlagListener(listenerKey, listener);
89-
setListeners({ ...listeners, ...{[listenerKey]: listener}});
90-
}
82+
setListeners({ ...listeners, ...{ [listenerKey]: listener } });
83+
};
9184

9285
const removeListener = () => {
9386
client.unregisterFeatureFlagListener(listenerKey, listeners[listenerKey]);
94-
let {[listenerKey]: omit, ...newListeners} = listeners;
87+
let { [listenerKey]: omit, ...newListeners } = listeners;
9588
setListeners(newListeners);
96-
}
89+
};
9790

98-
const flush = () => { client.flush(); }
91+
const flush = () => {
92+
client.flush();
93+
};
9994

10095
const setOffline = (newIsOffline) => {
10196
if (newIsOffline) {
@@ -104,18 +99,15 @@ const Body = () => {
10499
client.setOnline();
105100
}
106101
setIsOffline(newIsOffline);
107-
}
102+
};
108103

109104
return (
110105
<>
111106
<Text>Feature Key:</Text>
112-
<TextInput style={styles.input}
113-
onChangeText={setFlagKey} value={flagKey} />
107+
<TextInput style={styles.input} onChangeText={setFlagKey} value={flagKey} autoCapitalize="none" />
114108
<View style={styles.row}>
115109
<Button title="Evaluate Flag" onPress={evalFlag} />
116-
<Picker style={{flex: 1}}
117-
selectedValue={flagType}
118-
onValueChange={(itemValue, _) => setFlagType(itemValue)}>
110+
<Picker style={{ flex: 1 }} selectedValue={flagType} onValueChange={(itemValue, _) => setFlagType(itemValue)}>
119111
<Picker.Item label="Bool" value="bool" />
120112
<Picker.Item label="String" value="string" />
121113
<Picker.Item label="Number" value="number" />
@@ -125,24 +117,21 @@ const Body = () => {
125117
<Switch value={isOffline} onValueChange={setOffline} />
126118
</View>
127119
<Text>User Key:</Text>
128-
<TextInput style={styles.input}
129-
onChangeText={setUserKey} value={userKey} />
120+
<TextInput style={styles.input} onChangeText={setUserKey} value={userKey} />
130121
<View style={styles.row}>
131122
<Button title="Identify" onPress={identify} />
132123
<Button title="Track" onPress={track} />
133124
<Button title="Flush" onPress={flush} />
134125
</View>
135126
<Text>Feature Flag Listener Key:</Text>
136-
<TextInput style={styles.input}
137-
onChangeText={setListenerKey}
138-
value={listenerKey} />
127+
<TextInput style={styles.input} onChangeText={setListenerKey} value={listenerKey} />
139128
<View style={styles.row}>
140-
<Button title="Listen" onPress={listen}/>
141-
<Button title="Remove" onPress={removeListener}/>
129+
<Button title="Listen" onPress={listen} />
130+
<Button title="Remove" onPress={removeListener} />
142131
</View>
143132
</>
144133
);
145-
}
134+
};
146135

147136
const styles = StyleSheet.create({
148137
row: {
@@ -163,7 +152,7 @@ const App = () => {
163152
<Body />
164153
</Wrapper>
165154
);
166-
}
155+
};
167156

168157
MessageQueue.spy((msg) => {
169158
if (msg.module != 'LaunchdarklyReactNativeClient' && !msg.method.includes('LaunchdarklyReactNativeClient')) {
@@ -176,14 +165,18 @@ MessageQueue.spy((msg) => {
176165
if (params.length >= 2) {
177166
let cbIdSucc = params[params.length - 1];
178167
let cbIdFail = params[params.length - 2];
179-
if (Number.isInteger(cbIdSucc) && Number.isInteger(cbIdFail) &&
180-
(cbIdSucc & 1) === 1 && (cbIdFail & 1) === 0 &&
181-
(cbIdSucc >>> 1 === cbIdFail >>> 1)) {
168+
if (
169+
Number.isInteger(cbIdSucc) &&
170+
Number.isInteger(cbIdFail) &&
171+
(cbIdSucc & 1) === 1 &&
172+
(cbIdFail & 1) === 0 &&
173+
cbIdSucc >>> 1 === cbIdFail >>> 1
174+
) {
182175
params.splice(-2, 2, '<promise>');
183176
}
184177
}
185178

186-
logMsg += '(' + params.map(p => JSON.stringify(p)).join(', ') + ')';
179+
logMsg += '(' + params.map((p) => JSON.stringify(p)).join(', ') + ')';
187180
console.log(logMsg);
188181
});
189182

ManualTestApp/android/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "30.0.2"
65
minSdkVersion = 21
76
compileSdkVersion = 30
87
targetSdkVersion = 30
@@ -13,7 +12,7 @@ buildscript {
1312
mavenCentral()
1413
}
1514
dependencies {
16-
classpath("com.android.tools.build:gradle:4.2.2")
15+
classpath('com.android.tools.build:gradle:7.4.0')
1716
// NOTE: Do not place your application dependencies here; they belong
1817
// in the individual module build.gradle files
1918
}

ManualTestApp/android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
2828
FLIPPER_VERSION=0.99.0
29+
org.gradle.jvmargs=--add-opens java.base/java.io=ALL-UNNAMED
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

ManualTestApp/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "ManualTestApp",
33
"displayName": "ManualTestApp"
4-
}
4+
}

0 commit comments

Comments
 (0)