docstring_tokens
stringlengths
18
16.9k
code_tokens
stringlengths
75
1.81M
html_url
stringlengths
74
116
file_name
stringlengths
3
311
keep keep keep replace keep replace replace replace keep keep
<mask> * }] <mask> */ <mask> let BrowserActions = { <mask> async navigateToUrlAsync(originalUrl, initialProps = null) { <mask> try { <mask> const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; <mask> let manifestUrl = originalUrl; <mask> let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); <mask> <mask> // this can happen if fetching a local manifest (e.g. from a developer tool) </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove async navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps = null) { </s> add async navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps = null ) { </s> remove let item2time = (item2.time) ? item2.time : 0; let item1time = (item1.time) ? item1.time : 0; </s> add let item2time = item2.time ? item2.time : 0; let item1time = item1.time ? item1.time : 0; </s> remove return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); </s> add return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody, }); </s> remove let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); </s> add let historyItem = history.find( item => item.manifest && item.manifest.id === experienceId );
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace keep keep replace keep
<mask> let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); <mask> <mask> // this can happen if fetching a local manifest (e.g. from a developer tool) <mask> if (!ExManifests.isManifestSdkVersionSupported(manifest)) { <mask> throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); <mask> } <mask> <mask> return BrowserActions.navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps); <mask> } catch (e) { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove return BrowserActions.showLoadingError(e.code, e.message, originalUrl); </s> add return BrowserActions.showLoadingError(e.code, e.message, manifestUrl); </s> remove async navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps = null) { </s> add async navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps = null ) { </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); </s> add return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody, });
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep replace keep keep keep replace keep keep
<mask> return BrowserActions.navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps); <mask> } catch (e) { <mask> return BrowserActions.showLoadingError(e.code, e.message, originalUrl); <mask> } <mask> }, <mask> <mask> async navigateToExperienceIdWithNotificationAsync(experienceId, notificationBody) { <mask> let history = await LocalStorage.getHistoryAsync(); <mask> history = history.sort((item1, item2) => { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove return BrowserActions.navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps); </s> add return BrowserActions.navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps ); </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove payload: async function() { </s> add payload: (async function() { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove @action async clearHistoryAsync() { </s> add @action async clearHistoryAsync() {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace replace keep keep replace
<mask> history = history.sort((item1, item2) => { <mask> // date descending -- we want to pick the most recent experience with this id, <mask> // in case there are multiple (e.g. somebody was developing against various URLs of the <mask> // same app) <mask> let item2time = (item2.time) ? item2.time : 0; <mask> let item1time = (item1.time) ? item1.time : 0; <mask> return item2time - item1time; <mask> }); <mask> let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove async navigateToExperienceIdWithNotificationAsync(experienceId, notificationBody) { </s> add async navigateToExperienceIdWithNotificationAsync( experienceId, notificationBody ) { </s> remove return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); </s> add return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody, }); </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove async navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps = null) { </s> add async navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps = null ) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace keep keep keep keep keep
<mask> }); <mask> let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); <mask> if (historyItem) { <mask> // don't use the cached manifest, start over <mask> return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); <mask> } else { <mask> // we've never loaded this experience, silently fail <mask> // (this can happen if the user loads an experience, clears history, <mask> // then gets a push for the old experience) <mask> return BrowserActions.setKernelLoadingState(false); </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); </s> add let historyItem = history.find( item => item.manifest && item.manifest.id === experienceId ); </s> remove let item2time = (item2.time) ? item2.time : 0; let item1time = (item1.time) ? item1.time : 0; </s> add let item2time = item2.time ? item2.time : 0; let item1time = item1.time ? item1.time : 0; </s> remove async navigateToExperienceIdWithNotificationAsync(experienceId, notificationBody) { </s> add async navigateToExperienceIdWithNotificationAsync( experienceId, notificationBody ) { </s> remove async navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps = null) { </s> add async navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps = null ) { </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; }
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace keep keep keep keep keep
<mask> return BrowserActions.setKernelLoadingState(false); <mask> } <mask> }, <mask> <mask> async navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps = null) { <mask> let originalUrl = manifestUrl; <mask> // originalUrl was a package, not a manifest. <mask> if (bundleUrl === manifestUrl) { <mask> manifestUrl = null; <mask> } </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); </s> add return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody, }); </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); </s> add let historyItem = history.find( item => item.manifest && item.manifest.id === experienceId ); </s> remove return BrowserActions.showLoadingError(e.code, e.message, originalUrl); </s> add return BrowserActions.showLoadingError(e.code, e.message, manifestUrl);
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace keep keep keep keep keep
<mask> manifest, <mask> historyItem, <mask> initialProps, <mask> }, <mask> payload: async function() { <mask> let history = await LocalStorage.getHistoryAsync(); <mask> history = history.filter(item => item.url !== historyItem.url); <mask> history.unshift(historyItem); <mask> await LocalStorage.saveHistoryAsync(history); <mask> return history; </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove }(), </s> add })(), </s> remove @action async clearHistoryAsync() { </s> add @action async clearHistoryAsync() { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove payload: async function() { </s> add payload: (async function() { </s> remove return BrowserActions.showLoadingError(e.code, e.message, originalUrl); </s> add return BrowserActions.showLoadingError(e.code, e.message, manifestUrl); </s> remove }(), </s> add })(),
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep replace keep keep keep replace replace keep
<mask> await LocalStorage.saveHistoryAsync(history); <mask> return history; <mask> }(), <mask> }; <mask> }, <mask> <mask> @action <mask> foregroundUrlAsync(url) { <mask> return { url }; </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) { </s> remove payload: async function() { </s> add payload: (async function() { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove @action setInitialShellUrl(url) { </s> add @action setInitialShellUrl(url) { </s> remove payload: async function() { </s> add payload: (async function() {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep replace replace keep keep keep replace replace keep keep keep keep
<mask> <mask> @action <mask> foregroundHomeAsync(clearTasks = false) { <mask> return { clearTasks }; <mask> }, <mask> <mask> @action <mask> showMenuAsync(isVisible) { <mask> return { isVisible }; <mask> }, <mask> <mask> async setIsNuxFinishedAsync(isFinished) { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove @action foregroundUrlAsync(url) { </s> add @action foregroundUrlAsync(url) { </s> remove payload: async function() { </s> add payload: (async function() { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove @action setInitialShellUrl(url) { </s> add @action setInitialShellUrl(url) { </s> remove @action clearTaskWithError(browserTaskUrl) { </s> add @action clearTaskWithError(browserTaskUrl) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep replace keep keep replace
<mask> return { <mask> type: 'setIsNuxFinishedAsync', <mask> meta: { isFinished }, <mask> payload: async function() { <mask> await LocalStorage.saveIsNuxFinishedAsync(isFinished); <mask> return isFinished; <mask> }(), </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove payload: async function() { </s> add payload: (async function() { </s> remove @action foregroundUrlAsync(url) { </s> add @action foregroundUrlAsync(url) { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove @action showMenuAsync(isVisible) { </s> add @action showMenuAsync(isVisible) { </s> remove @action showLoadingError(code, message, originalUrl, manifest = null) { </s> add @action showLoadingError(code, message, originalUrl, manifest = null) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep replace replace keep keep keep replace replace
<mask> <mask> @action <mask> showLoadingError(code, message, originalUrl, manifest = null) { <mask> return { code, message, originalUrl, manifest }; <mask> }, <mask> <mask> @action <mask> clearTaskWithError(browserTaskUrl) { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove }(), </s> add })(), </s> remove @action setKernelLoadingState(isLoading) { </s> add @action setKernelLoadingState(isLoading) { </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep replace replace keep keep keep replace replace keep keep keep keep
<mask> }, <mask> <mask> @action <mask> setKernelLoadingState(isLoading) { <mask> return { isLoading }; <mask> }, <mask> <mask> @action <mask> setLoadingState(browserTaskUrl, isLoading) { <mask> return { url: browserTaskUrl, isLoading }; <mask> }, <mask> <mask> @action </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove @action setShellPropertiesAsync(isShell, shellManifestUrl) { </s> add @action setShellPropertiesAsync(isShell, shellManifestUrl) { </s> remove @action clearTaskWithError(browserTaskUrl) { </s> add @action clearTaskWithError(browserTaskUrl) { </s> remove @action showMenuAsync(isVisible) { </s> add @action showMenuAsync(isVisible) { </s> remove @action setInitialShellUrl(url) { </s> add @action setInitialShellUrl(url) { </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep replace replace keep keep keep replace replace keep keep keep
<mask> }, <mask> <mask> @action <mask> setShellPropertiesAsync(isShell, shellManifestUrl) { <mask> return { isShell, shellManifestUrl }; <mask> }, <mask> <mask> @action <mask> setInitialShellUrl(url) { <mask> return { url }; <mask> }, <mask> </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove @action setLoadingState(browserTaskUrl, isLoading) { </s> add @action setLoadingState(browserTaskUrl, isLoading) { </s> remove @action async loadHistoryAsync() { </s> add @action async loadHistoryAsync() { </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) { </s> remove @action foregroundUrlAsync(url) { </s> add @action foregroundUrlAsync(url) { </s> remove @action showMenuAsync(isVisible) { </s> add @action showMenuAsync(isVisible) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep keep keep keep replace replace keep keep keep keep replace replace
<mask> setInitialShellUrl(url) { <mask> return { url }; <mask> }, <mask> <mask> @action <mask> async loadHistoryAsync() { <mask> let history = await LocalStorage.getHistoryAsync(); <mask> return { history }; <mask> }, <mask> <mask> @action <mask> async clearHistoryAsync() { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove @action setInitialShellUrl(url) { </s> add @action setInitialShellUrl(url) { </s> remove payload: async function() { </s> add payload: (async function() { </s> remove return BrowserActions.showLoadingError(e.code, e.message, originalUrl); </s> add return BrowserActions.showLoadingError(e.code, e.message, manifestUrl); </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) { </s> remove @action foregroundUrlAsync(url) { </s> add @action foregroundUrlAsync(url) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Flux/BrowserActions.js
keep add keep keep keep keep keep keep
<mask> /* @flow */ <mask> <mask> import React from 'react'; <mask> import { <mask> ActivityIndicator, <mask> StyleSheet, <mask> Text, <mask> TouchableOpacity, </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove import { ActivityIndicator, StyleSheet, View } from 'react-native'; </s> add import { ActivityIndicator, StyleSheet, Text, TouchableOpacity, StatusBar, View, } from 'react-native'; </s> add import { Ionicons } from '@exponent/vector-icons'; import Colors from '../constants/Colors'; import BrowserActions from 'BrowserActions'; const LoadingWarningDelayMs = 5000; </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove @action showMenuAsync(isVisible) { </s> add @action showMenuAsync(isVisible) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Home/containers/GlobalLoadingOverlay.js
keep keep keep replace keep keep keep keep keep
<mask> /* @flow */ <mask> <mask> import React from 'react'; <mask> import { ActivityIndicator, StyleSheet, View } from 'react-native'; <mask> import { connect } from 'react-redux'; <mask> <mask> @connect(data => GlobalLoadingOverlay.getDataProps(data)) <mask> export default class GlobalLoadingOverlay extends React.Component { <mask> static getDataProps(data) { </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> add import { Ionicons } from '@exponent/vector-icons'; import Colors from '../constants/Colors'; import BrowserActions from 'BrowserActions'; const LoadingWarningDelayMs = 5000; </s> add import Exponent from 'exponent'; </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove @action async clearHistoryAsync() { </s> add @action async clearHistoryAsync() { </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Home/containers/GlobalLoadingOverlay.js
keep keep keep add keep keep keep keep keep keep
<mask> StatusBar, <mask> View, <mask> } from 'react-native'; <mask> import { connect } from 'react-redux'; <mask> <mask> @connect(data => GlobalLoadingOverlay.getDataProps(data)) <mask> export default class GlobalLoadingOverlay extends React.Component { <mask> static getDataProps(data) { <mask> return { <mask> isLoading: data.browser.isKernelLoading, </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove import { ActivityIndicator, StyleSheet, View } from 'react-native'; </s> add import { ActivityIndicator, StyleSheet, Text, TouchableOpacity, StatusBar, View, } from 'react-native'; </s> add import Exponent from 'exponent'; </s> remove @action async clearHistoryAsync() { </s> add @action async clearHistoryAsync() { </s> remove const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; let manifestUrl = originalUrl; let { bundleUrl, manifest } = await ExManifests.manifestUrlToBundleUrlAndManifestAsync(manifestUrl); </s> add let navigationRequestId = ++_navigationRequestId; let { bundleUrl, manifest } = await _fetchManifestAsync(manifestUrl); let isCancelled = _isLoadingCancelled[navigationRequestId]; _cleanupNavigationRequest(navigationRequestId); if (isCancelled) { return {}; } </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove @action showMenuAsync(isVisible) { </s> add @action showMenuAsync(isVisible) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Home/containers/GlobalLoadingOverlay.js
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> return <View />; <mask> } <mask> <mask> return ( <mask> <View style={styles.container}> <mask> <ActivityIndicator color="#fff" /> <mask> </View> <mask> ); <mask> } <mask> } <mask> <mask> const styles = StyleSheet.create({ </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove backgroundColor: 'rgba(0,0,0,0.4)', </s> add backgroundColor: 'rgba(255,255,255,0.8)', alignItems: 'center', justifyContent: 'center', paddingBottom: 20, }, loadingContainer: { </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove throw new Error(`This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.`); </s> add const CompanyName = Exponent.Constants.exponentVersion.match(/^1.13.2/) ? 'Expo' : 'Exponent'; throw new Error( `This experience uses an unsupported version of ${CompanyName} (SDK ${manifest.sdkVersion}). You may need to update ${CompanyName}.` ); </s> remove return BrowserActions.navigateToBundleUrlAsync(manifestUrl, manifest, bundleUrl, initialProps); </s> add return BrowserActions.navigateToBundleUrlAsync( manifestUrl, manifest, bundleUrl, initialProps ); </s> remove return BrowserActions.showLoadingError(e.code, e.message, originalUrl); </s> add return BrowserActions.showLoadingError(e.code, e.message, manifestUrl); </s> add import { Ionicons } from '@exponent/vector-icons'; import Colors from '../constants/Colors'; import BrowserActions from 'BrowserActions'; const LoadingWarningDelayMs = 5000;
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Home/containers/GlobalLoadingOverlay.js
keep keep keep keep replace keep keep keep keep
<mask> <mask> const styles = StyleSheet.create({ <mask> container: { <mask> ...StyleSheet.absoluteFillObject, <mask> backgroundColor: 'rgba(0,0,0,0.4)', <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> }, <mask> }); </s> Make it possible to cancel loading the manifest when navigating to an app from Exponent home (#144) * [native-component-list] Remove reference to Exponent in description * [ios][home] Make it possible to cancel loading the manifest * [ios][home] Warn users when loading is taking >5s, probably a connectivity issue * [ios][home] Address @terribleben's feedback fbshipit-source-id: 986f9a4 </s> remove <View style={styles.container}> <ActivityIndicator color="#fff" /> </View> </s> add <Exponent.Components.BlurView tint="default" intensity={100} style={styles.container}> <View style={styles.loadingContainer}> <ActivityIndicator color={Colors.blackText} size="small" /> <Text style={[styles.loadingText, { color: Colors.blackText }]}> Opening project... </Text> </View> {this._maybeRenderWarning()} <TouchableOpacity hitSlop={{ top: 20, left: 20, right: 20, bottom: 20 }} activeOpacity={0.5} style={styles.button} onPress={this._cancelLoadingExperienceAsync}> <Text style={styles.cancelText}>Cancel</Text> </TouchableOpacity> </Exponent.Components.BlurView> </s> remove return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody }); </s> add return BrowserActions.navigateToUrlAsync(historyItem.url, { notification: notificationBody, }); </s> remove let historyItem = history.find(item => (item.manifest && item.manifest.id === experienceId)); </s> add let historyItem = history.find( item => item.manifest && item.manifest.id === experienceId ); </s> remove async navigateToUrlAsync(originalUrl, initialProps = null) { </s> add cancelLoadingMostRecentManifestRequest() { if (!_isFetchingManifest[_navigationRequestId]) { throw new Error( 'Already finished fetching manifest, cancellation is not possible' ); } _isLoadingCancelled[_navigationRequestId] = true; return BrowserActions.setKernelLoadingState(false); }, async navigateToUrlAsync(manifestUrl, initialProps = null) { </s> remove @action foregroundHomeAsync(clearTasks = false) { </s> add @action foregroundHomeAsync(clearTasks = false) { </s> remove @action foregroundUrlAsync(url) { </s> add @action foregroundUrlAsync(url) {
https://github.com/expo/expo/commit/30ba1d5952d5ea47fc5d9248a9dfd8574e640383
js/Home/containers/GlobalLoadingOverlay.js
keep add keep keep keep keep keep keep
<mask> <mask> import expo.modules.updates.db.dao.AssetDao; <mask> import expo.modules.updates.db.dao.UpdateDao; <mask> import expo.modules.updates.db.entity.AssetEntity; <mask> import expo.modules.updates.db.entity.JSONDataEntity; <mask> import expo.modules.updates.db.entity.UpdateAssetEntity; <mask> import expo.modules.updates.db.entity.UpdateEntity; <mask> </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\ </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add public abstract JSONDataDao jsonDataDao();
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.java
keep keep keep add keep keep keep keep keep
<mask> import expo.modules.updates.db.dao.AssetDao; <mask> import expo.modules.updates.db.dao.JSONDataDao; <mask> import expo.modules.updates.db.dao.UpdateDao; <mask> import expo.modules.updates.db.entity.AssetEntity; <mask> import expo.modules.updates.db.entity.UpdateAssetEntity; <mask> import expo.modules.updates.db.entity.UpdateEntity; <mask> <mask> import androidx.annotation.NonNull; <mask> import androidx.room.Database; </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> add import expo.modules.updates.db.dao.JSONDataDao; </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\ </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add public abstract JSONDataDao jsonDataDao();
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.java
keep keep keep keep replace keep keep keep keep keep
<mask> import androidx.room.RoomDatabase; <mask> import androidx.room.TypeConverters; <mask> import androidx.sqlite.db.SupportSQLiteDatabase; <mask> <mask> @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) <mask> @TypeConverters({Converters.class}) <mask> public abstract class UpdatesDatabase extends RoomDatabase { <mask> <mask> private static UpdatesDatabase sInstance; <mask> </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> add public abstract JSONDataDao jsonDataDao(); </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> add import expo.modules.updates.db.dao.JSONDataDao; </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.java
keep add keep keep keep keep keep keep
<mask> public abstract UpdateDao updateDao(); <mask> public abstract AssetDao assetDao(); <mask> <mask> public static synchronized UpdatesDatabase getInstance(Context context) { <mask> if (sInstance == null) { <mask> sInstance = Room.databaseBuilder(context, UpdatesDatabase.class, DB_NAME) <mask> .fallbackToDestructiveMigration() <mask> .allowMainThreadQueries() </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\ </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> add import expo.modules.updates.db.dao.JSONDataDao;
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.java
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> @end <mask> <mask> static NSString * const EXUpdatesDatabaseErrorDomain = @"EXUpdatesDatabase"; <mask> static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; <mask> <mask> @implementation EXUpdatesDatabase <mask> <mask> # pragma mark - lifecycle <mask> </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> add public abstract JSONDataDao jsonDataDao(); </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\ </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> add import expo.modules.updates.db.dao.JSONDataDao;
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/ios/EXUpdates/Database/EXUpdatesDatabase.m
keep keep add keep keep keep keep keep
<mask> FOREIGN KEY(\"update_id\") REFERENCES \"updates\"(\"id\") ON DELETE CASCADE,\ <mask> FOREIGN KEY(\"asset_id\") REFERENCES \"assets\"(\"id\") ON DELETE CASCADE\ <mask> );\ <mask> CREATE UNIQUE INDEX \"index_updates_scope_key_commit_time\" ON \"updates\" (\"scope_key\", \"commit_time\");\ <mask> CREATE INDEX \"index_updates_launch_asset_id\" ON \"updates\" (\"launch_asset_id\");\ <mask> CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ <mask> "; <mask> </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> add CREATE INDEX \"index_json_data_scope_key\" ON \"json_data\" (\"scope_key\")\ </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add public abstract JSONDataDao jsonDataDao(); </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> add import expo.modules.updates.db.dao.JSONDataDao;
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/ios/EXUpdates/Database/EXUpdatesDatabase.m
keep keep add keep keep keep keep keep keep
<mask> );\ <mask> CREATE UNIQUE INDEX \"index_updates_scope_key_commit_time\" ON \"updates\" (\"scope_key\", \"commit_time\");\ <mask> CREATE INDEX \"index_updates_launch_asset_id\" ON \"updates\" (\"launch_asset_id\");\ <mask> "; <mask> <mask> char *errMsg; <mask> if (sqlite3_exec(_db, [createTableStmts UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) { <mask> if (error != nil) { <mask> *error = [self _errorFromSqlite:_db]; </s> [expo-updates][database] add json_data table (#11049) # Why In order to support the new EAS update manifest format and particularly the `serverDefinedHeaders` and `manifestFilters` fields, we need to be able to store some general JSON data from the server on disk (and then use it when requesting/launching future updates). It makes the most sense to use the SQLite database for this since we already use this to persist all other updates-related metadata. # How This PR adds a `json_data` table for storing arbitrary JSON blobs keyed by a string (like `manifestFilters`) and a scopeKey. Critically, this PR also bumps the updates SQLite database version number; this currently causes a destructive migration and requires that it be released in a major SDK release. A future PR will use this table in the implementation of the `serverDefinedHeaders` and `manifestFilters` from the RFC. # Test Plan Built Expo client on both platforms and viewed the updates SQLite database in a desktop SQLite browser to ensure the table was created properly. </s> add CREATE TABLE \"json_data\" (\ \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,\ \"key\" TEXT NOT NULL,\ \"value\" TEXT NOT NULL,\ \"last_updated\" INTEGER NOT NULL,\ \"scope_key\" TEXT NOT NULL\ );\ </s> add public abstract JSONDataDao jsonDataDao(); </s> remove @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class}, exportSchema = false, version = 3) </s> add @Database(entities = {UpdateEntity.class, UpdateAssetEntity.class, AssetEntity.class, JSONDataEntity.class}, exportSchema = false, version = 4) </s> remove static NSString * const EXUpdatesDatabaseFilename = @"expo-v3.db"; </s> add static NSString * const EXUpdatesDatabaseFilename = @"expo-v4.db"; </s> add import expo.modules.updates.db.entity.JSONDataEntity; </s> add import expo.modules.updates.db.dao.JSONDataDao;
https://github.com/expo/expo/commit/3169bf17e6c7195e6f08437c823c61559d03c835
packages/expo-updates/ios/EXUpdates/Database/EXUpdatesDatabase.m
keep keep keep replace keep keep replace
<mask> <mask> class Connectivity { <mask> _isAvailable = true; <mask> _listeners = {}; <mask> <mask> constructor() { <mask> NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => { </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove this._listeners[listener] = listener; </s> add this._listeners.add(listener); </s> remove state = { dataMigrationComplete: false, }; </s> add </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress);
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Api/Connectivity.js
keep keep keep keep replace keep keep keep keep keep
<mask> }; <mask> <mask> _handleConnectivityChange = (isAvailable: boolean) => { <mask> this._isAvailable = isAvailable; <mask> Object.values(this._listeners).forEach(listener => { <mask> typeof listener === 'function' && listener(this._isAvailable); <mask> }); <mask> }; <mask> <mask> addListener = (listener: any) => { </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove this._listeners[listener] = listener; </s> add this._listeners.add(listener); </s> remove delete this._listeners[listener]; </s> add this._listeners.delete(listener); </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove state = { dataMigrationComplete: false, }; </s> add </s> remove NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> add NetInfo.isConnected.addEventListener('connectionChange', this._handleConnectivityChange);
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Api/Connectivity.js
keep keep replace keep keep keep replace
<mask> <mask> addListener = (listener: any) => { <mask> this._listeners[listener] = listener; <mask> }; <mask> <mask> removeListener = (listener: any) => { <mask> delete this._listeners[listener]; </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => { </s> remove NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> add NetInfo.isConnected.addEventListener('connectionChange', this._handleConnectivityChange); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove state = { dataMigrationComplete: false, }; </s> add
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Api/Connectivity.js
keep keep keep keep replace keep keep keep keep keep
<mask> 'use strict'; <mask> <mask> import React, { PropTypes } from 'react'; <mask> import { <mask> BackAndroid, <mask> Image, <mask> NativeModules, <mask> Platform, <mask> StyleSheet, <mask> Text, </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove BackAndroid, </s> add BackHandler, </s> remove import { LegacyAsyncStorage } from 'expo'; </s> add </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done(); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress);
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Debug/ErrorScreenApp.android.js
keep keep keep keep replace keep keep keep keep keep
<mask> }; <mask> <mask> componentDidMount() { <mask> if (Platform.OS === 'android') { <mask> BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); <mask> } <mask> } <mask> <mask> render() { <mask> let initialRoute = this._getErrorScreenRoute(); </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove state = { dataMigrationComplete: false, }; </s> add </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done(); </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => {
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Debug/ErrorScreenApp.android.js
keep keep keep keep replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace
<mask> shell: PropTypes.bool, <mask> shellManifestUrl: PropTypes.string, <mask> }; <mask> <mask> state = { <mask> dataMigrationComplete: false, <mask> }; <mask> <mask> render() { <mask> if (!this.state.dataMigrationComplete) { <mask> return ( <mask> <View <mask> style={{ <mask> flex: 1, <mask> backgroundColor: 'white', <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> }}> <mask> <ActivityIndicator /> <mask> </View> <mask> ); <mask> } <mask> </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove <TouchableOpacity onPress={() => BackAndroid.exitApp()}> </s> add <TouchableOpacity onPress={() => BackHandler.exitApp()}> </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done();
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/ExponentApp.ios.js
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> } <mask> <mask> componentWillMount() { <mask> this._performDataMigrationAsync(); <mask> } <mask> <mask> componentWillReceiveProps(nextProps: any) { <mask> if (nextProps.shell !== this.props.shell) { <mask> ExStore.dispatch( </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove import { LegacyAsyncStorage } from 'expo'; </s> add </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/ExponentApp.ios.js
keep keep keep keep replace keep keep keep keep keep
<mask> ); <mask> } <mask> } <mask> <mask> _initialize = async () => { <mask> ExponentKernel.onLoaded(); <mask> <mask> if (ExponentKernel.__isFake) { <mask> return; <mask> } </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add </s> remove NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> add NetInfo.isConnected.addEventListener('connectionChange', this._handleConnectivityChange); </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done(); </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add </s> remove async _performDataMigrationAsync() { await LocalStorage.maybeMigrateFromLegacyAsync(); this.setState({ dataMigrationComplete: true }); this._initialize(); } </s> add
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/ExponentApp.ios.js
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
<mask> componentWillUnmount() { <mask> Linking.removeEventListener('url', this._handleUrl); <mask> } <mask> <mask> async _performDataMigrationAsync() { <mask> await LocalStorage.maybeMigrateFromLegacyAsync(); <mask> this.setState({ dataMigrationComplete: true }); <mask> this._initialize(); <mask> } <mask> <mask> _handleUrl = (event: { url: string }) => { <mask> let targetUrl = event.url; <mask> <mask> // don't compare to old url and refresh, because the manifest at this url may have changed <mask> ExStore.dispatch(BrowserActions.setKernelLoadingState(true)); </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => { </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove this._listeners[listener] = listener; </s> add this._listeners.add(listener);
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/ExponentApp.ios.js
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> import autobind from 'autobind-decorator'; <mask> import React, { PropTypes } from 'react'; <mask> import { <mask> BackAndroid, <mask> Image, <mask> NativeModules, <mask> ScrollView, <mask> StyleSheet, <mask> Text, </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove BackAndroid, </s> add BackHandler, </s> remove import { LegacyAsyncStorage } from 'expo'; </s> add </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done(); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress);
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Info/InfoScreenApp.android.js
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> _renderNav() { <mask> return ( <mask> <View style={styles.navBar}> <mask> <TouchableOpacity onPress={() => BackAndroid.exitApp()}> <mask> <Image source={{ uri: 'ic_arrow_back_white_36dp' }} style={styles.icon} /> <mask> </TouchableOpacity> <mask> <Text style={{ marginLeft: 14, color: 'white', fontSize: 20 }}>Info</Text> <mask> </View> <mask> ); </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add </s> remove state = { dataMigrationComplete: false, }; </s> add </s> remove function maybeMigrateFromLegacyAsync() { return LegacyAsyncStorage.migrateItems(Object.values(Keys)); } </s> add </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> add NetInfo.isConnected.addEventListener('connectionChange', this._handleConnectivityChange); </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => {
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Info/InfoScreenApp.android.js
keep keep keep keep replace keep keep keep keep keep
<mask> */ <mask> 'use strict'; <mask> <mask> import { AsyncStorage } from 'react-native'; <mask> import { LegacyAsyncStorage } from 'expo'; <mask> import mapValues from 'lodash/mapValues'; <mask> <mask> const Keys = mapValues( <mask> { <mask> AuthTokens: 'authTokens', </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove BackAndroid, </s> add BackHandler, </s> remove BackAndroid, </s> add BackHandler, </s> remove _listeners = {}; </s> add _listeners = new Set(); </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove this._performDataMigrationAsync(); </s> add this._initializeAsync().done();
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Storage/LocalStorage.js
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> }, <mask> value => `Exponent.${value}` <mask> ); <mask> <mask> function maybeMigrateFromLegacyAsync() { <mask> return LegacyAsyncStorage.migrateItems(Object.values(Keys)); <mask> } <mask> <mask> async function getIsNuxFinishedAsync() { <mask> let result = await AsyncStorage.getItem(Keys.NuxIsFinished); <mask> return result; <mask> } <mask> </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove _initialize = async () => { </s> add _initializeAsync = async () => { </s> remove async _performDataMigrationAsync() { await LocalStorage.maybeMigrateFromLegacyAsync(); this.setState({ dataMigrationComplete: true }); this._initialize(); } </s> add </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove NetInfo.isConnected.addEventListener('change', this._handleConnectivityChange); </s> add NetInfo.isConnected.addEventListener('connectionChange', this._handleConnectivityChange); </s> remove state = { dataMigrationComplete: false, }; </s> add
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Storage/LocalStorage.js
keep keep keep keep replace keep
<mask> saveIsNuxFinishedAsync, <mask> removeAuthTokensAsync, <mask> updateIdTokenAsync, <mask> updateSettingsAsync, <mask> maybeMigrateFromLegacyAsync, <mask> }; </s> BackAndroid -> BackHandler, NetInfo change -> connectionChange, remove legacy AsyncStorage migration Removed / addressed three different deprecated APIs fbshipit-source-id: ff9813f </s> remove this._listeners[listener] = listener; </s> add this._listeners.add(listener); </s> remove delete this._listeners[listener]; </s> add this._listeners.delete(listener); </s> remove state = { dataMigrationComplete: false, }; </s> add </s> remove Object.values(this._listeners).forEach(listener => { </s> add this._listeners.forEach(listener => { </s> remove BackAndroid.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> add BackHandler.addEventListener('hardwareBackPress', this._handleBackButtonPress); </s> remove if (!this.state.dataMigrationComplete) { return ( <View style={{ flex: 1, backgroundColor: 'white', alignItems: 'center', justifyContent: 'center', }}> <ActivityIndicator /> </View> ); } </s> add
https://github.com/expo/expo/commit/31d4498fe94c980f39adf927cc8d3e3cc2b7a995
js/Storage/LocalStorage.js
keep keep keep replace keep keep keep replace keep
<mask> } <mask> <mask> private val assetsUrlBase: Uri? by lazy { <mask> getAssetsUrlBase(mManifestUrl, rawManifestJson) <mask> } <mask> <mask> override val isDevelopmentMode: Boolean by lazy { <mask> rawManifestJson.isDevelopmentMode() <mask> } </s> [go][ios][android] Fix recent project feature with new manifest wrappers (#12805) </s> remove metadata = rawManifestJson.getRawJson() </s> add metadata = [email protected]() </s> remove val rawManifestJson: RawManifest </s> add val rawManifest: RawManifest </s> remove override val rawManifestJson: NewRawManifest, </s> add override val rawManifest: NewRawManifest, </s> remove import java.util.* </s> add </s> add @Deprecated(message = "Prefer to use specific field getters") override fun toString(): String { return getRawJson().toString() }
https://github.com/expo/expo/commit/339ad203a2c1bc69f0e954b56dc6606b28723729
packages/expo-updates/android/src/main/java/expo/modules/updates/manifest/LegacyManifest.kt
keep keep keep keep replace keep keep keep keep replace keep
<mask> import expo.modules.updates.db.entity.AssetEntity <mask> import expo.modules.updates.db.entity.UpdateEntity <mask> import expo.modules.updates.manifest.raw.RawManifest <mask> import org.json.JSONObject <mask> import java.util.* <mask> <mask> interface Manifest { <mask> val updateEntity: UpdateEntity? <mask> val assetEntityList: List<AssetEntity?>? <mask> val rawManifestJson: RawManifest <mask> val serverDefinedHeaders: JSONObject? </s> [go][ios][android] Fix recent project feature with new manifest wrappers (#12805) </s> remove override val rawManifestJson: NewRawManifest, </s> add override val rawManifest: NewRawManifest, </s> remove metadata = rawManifestJson.getRawJson() </s> add metadata = [email protected]() </s> remove rawManifestJson.isDevelopmentMode() </s> add rawManifest.isDevelopmentMode() </s> remove getAssetsUrlBase(mManifestUrl, rawManifestJson) </s> add getAssetsUrlBase(mManifestUrl, rawManifest) </s> add @Deprecated(message = "Prefer to use specific field getters") override fun toString(): String { return getRawJson().toString() }
https://github.com/expo/expo/commit/339ad203a2c1bc69f0e954b56dc6606b28723729
packages/expo-updates/android/src/main/java/expo/modules/updates/manifest/Manifest.kt
keep keep keep keep replace keep keep keep keep keep
<mask> import java.text.ParseException <mask> import java.util.* <mask> <mask> class NewManifest private constructor( <mask> override val rawManifestJson: NewRawManifest, <mask> private val mId: UUID, <mask> private val mScopeKey: String, <mask> private val mCommitTime: Date, <mask> private val mRuntimeVersion: String, <mask> private val mLaunchAsset: JSONObject, </s> [go][ios][android] Fix recent project feature with new manifest wrappers (#12805) </s> remove import java.util.* </s> add </s> remove rawManifestJson.isDevelopmentMode() </s> add rawManifest.isDevelopmentMode() </s> remove getAssetsUrlBase(mManifestUrl, rawManifestJson) </s> add getAssetsUrlBase(mManifestUrl, rawManifest) </s> remove val rawManifestJson: RawManifest </s> add val rawManifest: RawManifest </s> remove metadata = rawManifestJson.getRawJson() </s> add metadata = [email protected]() </s> add @Deprecated(message = "Prefer to use specific field getters") override fun toString(): String { return getRawJson().toString() }
https://github.com/expo/expo/commit/339ad203a2c1bc69f0e954b56dc6606b28723729
packages/expo-updates/android/src/main/java/expo/modules/updates/manifest/NewManifest.kt
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> override val updateEntity: UpdateEntity by lazy { <mask> UpdateEntity(mId, mCommitTime, mRuntimeVersion, mScopeKey).apply { <mask> metadata = rawManifestJson.getRawJson() <mask> } <mask> } <mask> <mask> override val assetEntityList: List<AssetEntity> by lazy { <mask> val assetList = mutableListOf<AssetEntity>() </s> [go][ios][android] Fix recent project feature with new manifest wrappers (#12805) </s> remove getAssetsUrlBase(mManifestUrl, rawManifestJson) </s> add getAssetsUrlBase(mManifestUrl, rawManifest) </s> remove rawManifestJson.isDevelopmentMode() </s> add rawManifest.isDevelopmentMode() </s> remove val rawManifestJson: RawManifest </s> add val rawManifest: RawManifest </s> remove import java.util.* </s> add </s> add @Deprecated(message = "Prefer to use specific field getters") override fun toString(): String { return getRawJson().toString() } </s> remove override val rawManifestJson: NewRawManifest, </s> add override val rawManifest: NewRawManifest,
https://github.com/expo/expo/commit/339ad203a2c1bc69f0e954b56dc6606b28723729
packages/expo-updates/android/src/main/java/expo/modules/updates/manifest/NewManifest.kt
keep keep keep add keep keep keep keep keep keep
<mask> <mask> @Deprecated(message = "Prefer to use specific field getters") <mask> fun getRawJson(): JSONObject = json <mask> <mask> @Throws(JSONException::class) <mask> fun getID(): String = json.getString("id") <mask> <mask> @Throws(JSONException::class) <mask> abstract fun getBundleURL(): String <mask> </s> [go][ios][android] Fix recent project feature with new manifest wrappers (#12805) </s> remove metadata = rawManifestJson.getRawJson() </s> add metadata = [email protected]() </s> remove rawManifestJson.isDevelopmentMode() </s> add rawManifest.isDevelopmentMode() </s> remove override val rawManifestJson: NewRawManifest, </s> add override val rawManifest: NewRawManifest, </s> remove val rawManifestJson: RawManifest </s> add val rawManifest: RawManifest </s> remove import java.util.* </s> add </s> remove getAssetsUrlBase(mManifestUrl, rawManifestJson) </s> add getAssetsUrlBase(mManifestUrl, rawManifest)
https://github.com/expo/expo/commit/339ad203a2c1bc69f0e954b56dc6606b28723729
packages/expo-updates/android/src/main/java/expo/modules/updates/manifest/raw/RawManifest.kt
keep replace keep keep replace replace replace replace replace replace replace replace keep keep
<mask> import Constants from 'expo-constants'; <mask> import { YellowBox } from 'react-native'; <mask> if (__DEV__) { <mask> if (Constants.manifest?.experiments?.redesignedLogBox) { <mask> // @ts-ignore: This needs to be run before Expo.fx, and it's not included on external types <mask> YellowBox.__unstable_enableLogBox(); <mask> } <mask> else { <mask> // Replace the YellowBox.__unstable_enableLogBox function to make discovery easier if <mask> // someone is following the React Native 62 blog post. <mask> // @ts-ignore <mask> YellowBox.__unstable_enableLogBox = () => console.warn('To enable the redesigned LogBox in your app, add "experiments": {"redesignedLogBox": true} to your app.json or app.config.js.'); <mask> } <mask> } </s> [expo] Remove redesigned logbox effect (#10273) </s> remove // @ts-ignore: This needs to be run before Expo.fx, and it's not included on external types YellowBox.__unstable_enableLogBox(); } else { // Replace the YellowBox.__unstable_enableLogBox function to make discovery easier if // someone is following the React Native 62 blog post. // @ts-ignore YellowBox.__unstable_enableLogBox = () => console.warn( 'To enable the redesigned LogBox in your app, add "experiments": {"redesignedLogBox": true} to your app.json or app.config.js.' ); </s> add console.warn( 'LogBox is enabled by default on SDK 39 and higher. You can now remove the experiments.redesignedLogBox from your app configuration to get rid of this warning.' ); </s> remove import { YellowBox } from 'react-native'; </s> add
https://github.com/expo/expo/commit/343d84210c686d91488b8cb62591b9684614286d
packages/expo/build/environment/LogBox.fx.expo.js
keep replace keep keep keep replace replace replace replace replace replace replace replace replace replace keep
<mask> import Constants from 'expo-constants'; <mask> import { YellowBox } from 'react-native'; <mask> <mask> if (__DEV__) { <mask> if (Constants.manifest?.experiments?.redesignedLogBox) { <mask> // @ts-ignore: This needs to be run before Expo.fx, and it's not included on external types <mask> YellowBox.__unstable_enableLogBox(); <mask> } else { <mask> // Replace the YellowBox.__unstable_enableLogBox function to make discovery easier if <mask> // someone is following the React Native 62 blog post. <mask> // @ts-ignore <mask> YellowBox.__unstable_enableLogBox = () => <mask> console.warn( <mask> 'To enable the redesigned LogBox in your app, add "experiments": {"redesignedLogBox": true} to your app.json or app.config.js.' <mask> ); <mask> } </s> [expo] Remove redesigned logbox effect (#10273) </s> remove // @ts-ignore: This needs to be run before Expo.fx, and it's not included on external types YellowBox.__unstable_enableLogBox(); } else { // Replace the YellowBox.__unstable_enableLogBox function to make discovery easier if // someone is following the React Native 62 blog post. // @ts-ignore YellowBox.__unstable_enableLogBox = () => console.warn('To enable the redesigned LogBox in your app, add "experiments": {"redesignedLogBox": true} to your app.json or app.config.js.'); </s> add console.warn('LogBox is enabled by default on SDK 39 and higher. You can now remove the experiments.redesignedLogBox from your app configuration to get rid of this warning.'); </s> remove import { YellowBox } from 'react-native'; </s> add
https://github.com/expo/expo/commit/343d84210c686d91488b8cb62591b9684614286d
packages/expo/src/environment/LogBox.fx.expo.ts
keep keep add keep keep keep keep keep keep
<mask> 'expo-gl-cpp-legacy' <mask> ] <mask> ]) <mask> END UNCOMMENT WHEN DISTRIBUTING */ <mask> <mask> // WHEN_DISTRIBUTING_REMOVE_FROM_HERE <mask> api project(':ReactAndroid') <mask> <mask> // Universal modules </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add // expo-random is no longer a unimodule api project(':expo-random') </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> remove #import <UMCore/UMModuleRegistry.h> #import <UIKit/UIKit.h> @interface EXRandom : UMExportedModule </s> add @interface EXRandom : NSObject <RCTBridgeModule>
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/build.gradle
keep add keep keep keep keep keep keep
<mask> ]) <mask> <mask> // Versioned react native <mask> // WHEN_PREPARING_SHELL_REMOVE_FROM_HERE <mask> // THIS COMMENT IS USED BY android-build-aar.sh DO NOT MODIFY <mask> // BEGIN_SDK_38 <mask> api 'host.exp:reactandroid-abi38_0_0:1.0.0' <mask> // END_SDK_38 </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add compileOnly project(':expo-random') </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> remove #import <UMCore/UMModuleRegistry.h> #import <UIKit/UIKit.h> @interface EXRandom : UMExportedModule </s> add @interface EXRandom : NSObject <RCTBridgeModule>
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/build.gradle
keep keep keep keep replace keep keep keep keep keep
<mask> import expo.modules.network.NetworkPackage; <mask> import expo.modules.payments.stripe.StripePackage; <mask> import expo.modules.permissions.PermissionsPackage; <mask> import expo.modules.print.PrintPackage; <mask> import expo.modules.random.RandomPackage; <mask> import expo.modules.screencapture.ScreenCapturePackage; <mask> import expo.modules.securestore.SecureStorePackage; <mask> import expo.modules.sensors.SensorsPackage; <mask> import expo.modules.sms.SMSPackage; <mask> import expo.modules.speech.SpeechPackage; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add import expo.modules.random.RandomPackage; </s> remove import android.content.Context; </s> add import com.facebook.react.ReactPackage; import com.facebook.react.bridge.NativeModule; import com.facebook.react.uimanager.ViewManager; import com.facebook.react.bridge.ReactApplicationContext; </s> remove import org.unimodules.core.ExportedModule; import org.unimodules.core.ModuleRegistry; import org.unimodules.core.interfaces.ExpoMethod; import org.unimodules.core.Promise; </s> add import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; </s> remove import android.content.Context; </s> add </s> add import java.util.Arrays; </s> add // This is an Expo module but not a unimodule import expo.modules.random.RandomModule;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java
keep keep keep keep replace keep keep keep keep keep
<mask> new NetworkPackage(), <mask> new NotificationsPackage(), <mask> new PermissionsPackage(), <mask> new PrintPackage(), <mask> new RandomPackage(), <mask> new SMSPackage(), <mask> new SQLitePackage(), <mask> new ScreenCapturePackage(), <mask> new ScreenOrientationPackage(), <mask> new SecureStorePackage(), </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove new expo.modules.random.RandomPackage(), </s> add </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> add implementation project(":expo-random") </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); },
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/src/main/java/versioned/host/exp/exponent/ExperiencePackagePicker.java
keep add keep keep keep keep keep keep
<mask> import versioned.host.exp.exponent.modules.universal.ExpoModuleRegistryAdapter; <mask> import versioned.host.exp.exponent.modules.universal.ScopedModuleRegistryAdapter; <mask> <mask> import static host.exp.exponent.kernel.KernelConstants.IS_HEADLESS_KEY; <mask> import static host.exp.exponent.kernel.KernelConstants.LINKING_URI_KEY; <mask> <mask> public class ExponentPackage implements ReactPackage { <mask> private static final String TAG = ExponentPackage.class.getSimpleName(); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add import java.util.Arrays; </s> remove import org.unimodules.core.BasePackage; import org.unimodules.core.ExportedModule; import org.unimodules.core.ViewManager; </s> add public class RandomPackage implements ReactPackage { @Override public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) { return Arrays.<NativeModule>asList(new RandomModule(reactContext)); } </s> remove public class RandomModule extends ExportedModule { </s> add public class RandomModule extends ReactContextBaseJavaModule { SecureRandom mSecureRandom; </s> remove import org.unimodules.core.ExportedModule; import org.unimodules.core.ModuleRegistry; import org.unimodules.core.interfaces.ExpoMethod; import org.unimodules.core.Promise; </s> add import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; </s> remove public class RandomPackage extends BasePackage { </s> add </s> remove SecureRandom mRandom; public RandomModule(Context context) { </s> add public RandomModule(ReactApplicationContext context) {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
keep keep keep add keep keep keep keep
<mask> ScopedContext scopedContext = new ScopedContext(reactContext, experienceId.getUrlEncoded()); <mask> <mask> nativeModules.add(new NotificationsModule(reactContext, mManifest, mExperienceProperties)); <mask> nativeModules.add(new RNViewShotModule(reactContext, scopedContext)); <mask> nativeModules.add(new ExponentTestNativeModule(reactContext)); <mask> nativeModules.add(new PedometerModule(reactContext)); <mask> nativeModules.add(new ScreenOrientationModule(reactContext)); <mask> nativeModules.add(new RNGestureHandlerModule(reactContext)); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> add implementation project(":expo-random") </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove @ExpoMethod public void getRandomBase64StringAsync(int randomByteCount, final Promise promise) { </s> add @ReactMethod public void getRandomBase64StringAsync(int randomByteCount, Promise promise) { promise.resolve(getRandomBase64String(randomByteCount)); } @ReactMethod(isBlockingSynchronousMethod = true) public String getRandomBase64String(int randomByteCount) { if (mSecureRandom == null) { mSecureRandom = new SecureRandom(); }
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/expoview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
keep keep keep add keep keep keep keep keep keep
<mask> include ':ReactAndroid' <mask> include ':unimodules-test-core' <mask> project(':unimodules-test-core').projectDir = new File(rootDir, '../packages/unimodules-test-core/android') <mask> <mask> [ <mask> // ADD_NEW_SUPPORTED_ABIS_HERE <mask> "abi38_0_0", <mask> "abi37_0_0", <mask> "abi36_0_0", <mask> ].forEach({ abiVariant -> </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); </s> remove ExpoRandom: [{ key: 0, argumentsCount: 1, name: 'getRandomBase64StringAsync' }], </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
android/settings.gradle
keep add keep keep keep keep keep
<mask> <mask> implementation project(":expo-image") <mask> <mask> def packageJsonFile = new File(rootProject.projectDir, '../package.json') <mask> def packageJson = new JsonSlurper().parseText(packageJsonFile.text) <mask> def excludedUnimodules = packageJson.excludedUnimodules != null ? packageJson.excludedUnimodules : [] <mask> </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> remove @Override public void onCreate(ModuleRegistry moduleRegistry) { if (moduleRegistry != null) { mRandom = new SecureRandom(); } } </s> add </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove @ExpoMethod public void getRandomBase64StringAsync(int randomByteCount, final Promise promise) { </s> add @ReactMethod public void getRandomBase64StringAsync(int randomByteCount, Promise promise) { promise.resolve(getRandomBase64String(randomByteCount)); } @ReactMethod(isBlockingSynchronousMethod = true) public String getRandomBase64String(int randomByteCount) { if (mSecureRandom == null) { mSecureRandom = new SecureRandom(); }
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/android/app/build.gradle
keep add keep keep keep keep keep keep
<mask> import com.facebook.soloader.SoLoader; <mask> <mask> import org.unimodules.adapters.react.ModuleRegistryAdapter; <mask> import org.unimodules.adapters.react.ReactModuleRegistryProvider; <mask> <mask> import java.util.List; <mask> <mask> import dev.expo.payments.generated.BasePackageList; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove import android.content.Context; </s> add import com.facebook.react.ReactPackage; import com.facebook.react.bridge.NativeModule; import com.facebook.react.uimanager.ViewManager; import com.facebook.react.bridge.ReactApplicationContext; </s> add import java.util.Arrays; </s> remove import expo.modules.random.RandomPackage; </s> add </s> remove import org.unimodules.core.BasePackage; import org.unimodules.core.ExportedModule; import org.unimodules.core.ViewManager; </s> add public class RandomPackage implements ReactPackage { @Override public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) { return Arrays.<NativeModule>asList(new RandomModule(reactContext)); } </s> remove import org.unimodules.core.ExportedModule; import org.unimodules.core.ModuleRegistry; import org.unimodules.core.interfaces.ExpoMethod; import org.unimodules.core.Promise; </s> add import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; </s> remove import android.content.Context; </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/android/app/src/main/java/dev/expo/payments/MainApplication.java
keep keep keep add keep keep keep keep keep keep
<mask> <mask> @Override <mask> protected List<ReactPackage> getPackages() { <mask> List<ReactPackage> packages = new PackageList(this).getPackages(); <mask> packages.add(new ModuleRegistryAdapter(mModuleRegistryProvider)); <mask> return packages; <mask> } <mask> <mask> <mask> @Override </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove @Override public void onCreate(ModuleRegistry moduleRegistry) { if (moduleRegistry != null) { mRandom = new SecureRandom(); } } </s> add </s> remove public List<ExportedModule> createExportedModules(Context context) { return Collections.singletonList((ExportedModule) new RandomModule(context)); </s> add public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) { return Collections.emptyList(); </s> remove import org.unimodules.core.BasePackage; import org.unimodules.core.ExportedModule; import org.unimodules.core.ViewManager; </s> add public class RandomPackage implements ReactPackage { @Override public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) { return Arrays.<NativeModule>asList(new RandomModule(reactContext)); } </s> remove public class RandomPackage extends BasePackage { </s> add </s> remove SecureRandom mRandom; public RandomModule(Context context) { </s> add public RandomModule(ReactApplicationContext context) { </s> add export function getRandomBytes(byteCount: number): Uint8Array { assertByteCount(byteCount, 'getRandomBytes'); const validByteCount = Math.floor(byteCount); if (ExpoRandom.getRandomBytes) { return ExpoRandom.getRandomBytes(validByteCount); } else if (ExpoRandom.getRandomBase64String) { const base64 = ExpoRandom.getRandomBase64String(validByteCount); return toByteArray(base64); } else { throw new UnavailabilityError('expo-random', 'getRandomBytes'); } }
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/android/app/src/main/java/dev/expo/payments/MainApplication.java
keep keep keep keep replace keep keep keep keep keep
<mask> new expo.modules.network.NetworkPackage(), <mask> new expo.modules.notifications.NotificationsPackage(), <mask> new expo.modules.permissions.PermissionsPackage(), <mask> new expo.modules.print.PrintPackage(), <mask> new expo.modules.random.RandomPackage(), <mask> new expo.modules.screencapture.ScreenCapturePackage(), <mask> new expo.modules.screenorientation.ScreenOrientationPackage(), <mask> new expo.modules.securestore.SecureStorePackage(), <mask> new expo.modules.sensors.SensorsPackage(), <mask> new expo.modules.sharing.SharingPackage(), </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove new RandomPackage(), </s> add </s> add include(":expo-random") project(":expo-random").projectDir = new File("../../../packages/expo-random/android") </s> add implementation project(":expo-random") </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); },
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/android/app/src/main/java/dev/expo/payments/generated/BasePackageList.java
keep add keep keep keep keep
<mask> project(":expo-image").projectDir = new File("../../../packages/expo-image/android") <mask> <mask> include(":unimodules-test-core") <mask> project(":unimodules-test-core").projectDir = new File("../../../packages/unimodules-test-core/android") <mask> <mask> // Unimodules </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add // Include Expo modules that are not unimodules include(":expo-random") project(":expo-random").projectDir = new File("../packages/expo-random/android") </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); </s> add implementation project(":expo-random")
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/android/settings.gradle
keep add keep keep keep keep
<mask> pod 'EXDevMenu', path: '../../../packages/expo-dev-menu' <mask> pod 'expo-image', path: '../../../packages/expo-image' <mask> <mask> # Fix Google Sign-in <mask> post_install do |installer| <mask> installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result| </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add # Expo modules that are not unimodules pod 'EXRandom', path: '../packages/expo-random/ios' </s> add "expo-random": "^8.2.1", </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */; </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */ = { </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Podfile
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> - EXPrint (9.0.2) <mask> EXRandom: <mask> BUILD_SETTINGS_CHECKSUM: <mask> EXRandom: <mask> :debug: ff6c0d51873fcc617a9b0822d664f413 <mask> :release: ff6c0d51873fcc617a9b0822d664f413 <mask> CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 <mask> FILES: <mask> - "../../../../packages/expo-random/ios/EXRandom/EXRandom.h" <mask> - "../../../../packages/expo-random/ios/EXRandom/EXRandom.m" <mask> PROJECT_NAME: EXRandom <mask> SPECS: </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove :debug: 09dc0cb0d42b4b64abf3c5c763a954bf :release: 09dc0cb0d42b4b64abf3c5c763a954bf CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: cf0fc244a5cff207ba734b93651c9754 :release: cf0fc244a5cff207ba734b93651c9754 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> remove Debug: 9184484a21be9ed9a9f876300d40939b Release: 9184484a21be9ed9a9f876300d40939b </s> add Debug: 76816b7215772a4870f549c2b493264f Release: 76816b7215772a4870f549c2b493264f </s> remove Debug: a1d9aab80ff7dae91b622a89156ed852 Release: a1d9aab80ff7dae91b622a89156ed852 </s> add Debug: 43b2d98bf58cabcae557565e34d424cb Release: 43b2d98bf58cabcae557565e34d424cb </s> add #pragma mark - Internal methods - (NSString *)_getRandomBase64String:(NSUInteger)length error:(NSError **)error { NSMutableData *bytes = [NSMutableData dataWithLength:length]; OSStatus result = SecRandomCopyBytes(kSecRandomDefault, length, [bytes mutableBytes]); if (result == errSecSuccess) { return [bytes base64EncodedStringWithOptions:0]; } else if (error) { *error = [NSError errorWithDomain:@"expo-random" code:result userInfo:nil]; } return nil; } </s> remove #import <UMCore/UMModuleRegistry.h> #import <UIKit/UIKit.h> @interface EXRandom : UMExportedModule </s> add @interface EXRandom : NSObject <RCTBridgeModule> </s> remove // Copyright 2019-present 650 Industries. All rights reserved. </s> add #if __has_include("RCTBridgeModule.h") #import "RCTBridgeModule.h" #else #import <React/RCTBridgeModule.h> #endif
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/.project_cache/installation_cache.yaml
keep keep keep keep replace replace keep keep keep keep keep
<mask> - nanopb/decode (0.3.9011) <mask> - nanopb/encode (0.3.9011) <mask> Pods-BareExpo: <mask> BUILD_SETTINGS_CHECKSUM: <mask> Debug: 9184484a21be9ed9a9f876300d40939b <mask> Release: 9184484a21be9ed9a9f876300d40939b <mask> FILES: <mask> - "${PODS_CONFIGURATION_BUILD_DIR}/EXDevMenu/EXDevMenu.bundle" <mask> - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle" <mask> - "${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der" <mask> - "${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der" </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove Debug: a1d9aab80ff7dae91b622a89156ed852 Release: a1d9aab80ff7dae91b622a89156ed852 </s> add Debug: 43b2d98bf58cabcae557565e34d424cb Release: 43b2d98bf58cabcae557565e34d424cb </s> remove :debug: ff6c0d51873fcc617a9b0822d664f413 :release: ff6c0d51873fcc617a9b0822d664f413 CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: c8cd2f6f0ffc63ec50d5d281845c43d7 :release: c8cd2f6f0ffc63ec50d5d281845c43d7 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> remove :debug: 09dc0cb0d42b4b64abf3c5c763a954bf :release: 09dc0cb0d42b4b64abf3c5c763a954bf CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: cf0fc244a5cff207ba734b93651c9754 :release: cf0fc244a5cff207ba734b93651c9754 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> add #pragma mark - Internal methods - (NSString *)_getRandomBase64String:(NSUInteger)length error:(NSError **)error { NSMutableData *bytes = [NSMutableData dataWithLength:length]; OSStatus result = SecRandomCopyBytes(kSecRandomDefault, length, [bytes mutableBytes]); if (result == errSecSuccess) { return [bytes base64EncodedStringWithOptions:0]; } else if (error) { *error = [NSError errorWithDomain:@"expo-random" code:result userInfo:nil]; } return nil; } </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */ = { </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */ = { </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/.project_cache/installation_cache.yaml
keep replace replace replace keep keep keep replace keep keep keep
<mask> /* Begin PBXBuildFile section */ <mask> 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 738B1A376EFF56FBAB8B0CA54A1C24B6 /* EXRandom.m */; }; <mask> 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */; }; <mask> A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C895A037BDF05259C9F964D5FDCA0E0 /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; <mask> /* End PBXBuildFile section */ <mask> <mask> /* Begin PBXContainerItemProxy section */ <mask> 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { <mask> isa = PBXContainerItemProxy; <mask> containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; <mask> proxyType = 1; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> remove 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */; </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace keep replace replace keep keep keep keep
<mask> /* Begin PBXContainerItemProxy section */ <mask> 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { <mask> isa = PBXContainerItemProxy; <mask> containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; <mask> proxyType = 1; <mask> remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; <mask> remoteInfo = UMCore; <mask> }; <mask> /* End PBXContainerItemProxy section */ <mask> <mask> /* Begin PBXFileReference section */ </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */; </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove name = UMCore; targetProxy = 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep replace keep keep keep replace keep keep keep keep
<mask> ABA839BF6EF1B661F43A935E0835C42B /* libEXRandom.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libEXRandom.a; path = libEXRandom.a; sourceTree = BUILT_PRODUCTS_DIR; }; <mask> B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "EXRandom-dummy.m"; sourceTree = "<group>"; }; <mask> D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; <mask> /* End PBXFileReference section */ <mask> <mask> /* Begin PBXFrameworksBuildPhase section */ <mask> E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */ = { <mask> isa = PBXFrameworksBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> ); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> remove BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep add keep keep keep keep keep
<mask> name = Frameworks; <mask> sourceTree = "<group>"; <mask> }; <mask> 600BD6871B5DA12DF656FA3C6572A3B5 /* Products */ = { <mask> isa = PBXGroup; <mask> children = ( <mask> ABA839BF6EF1B661F43A935E0835C42B /* libEXRandom.a */, <mask> ); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> remove A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> ); <mask> name = Pod; <mask> sourceTree = "<group>"; <mask> }; <mask> 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { <mask> isa = PBXGroup; <mask> children = ( <mask> D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, <mask> ); <mask> name = Dependencies; <mask> sourceTree = "<group>"; <mask> }; <mask> 80962096FF0220C13B38BAE42ABD0556 /* Support Files */ = { <mask> isa = PBXGroup; <mask> children = ( <mask> B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */, <mask> 60A2A2B6543660C670BB85E2A7A1CDE0 /* EXRandom-prefix.pch */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; };
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> }; <mask> EF3248404F968B773E287A4D87F4BEF4 = { <mask> isa = PBXGroup; <mask> children = ( <mask> 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, <mask> 25A2EC3FEF3DD88808234401BA03EE6A /* EXRandom */, <mask> 389259836FBA79F409DA40FEE4D80FA0 /* Frameworks */, <mask> 600BD6871B5DA12DF656FA3C6572A3B5 /* Products */, <mask> ); <mask> sourceTree = "<group>"; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep replace keep keep keep replace
<mask> <mask> /* Begin PBXHeadersBuildPhase section */ <mask> 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */ = { <mask> isa = PBXHeadersBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */, </s> add 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */, </s> remove 413A76996CF33CEF683471A45AC655E9 /* Headers */ = { </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */ = { </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace keep replace replace replace keep keep
<mask> /* Begin PBXNativeTarget section */ <mask> 00EB4A6BB9778AFFF7F587D732973596 /* EXRandom */ = { <mask> isa = PBXNativeTarget; <mask> buildConfigurationList = DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */; <mask> buildPhases = ( <mask> 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */, <mask> 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */, <mask> E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */, <mask> ); <mask> buildRules = ( </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove buildConfigurationList = 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> add buildConfigurationList = 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> remove 413A76996CF33CEF683471A45AC655E9 /* Headers */, 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */, BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { </s> remove 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */, 7045DB3ABDD227D30A1753624D0021F7 /* Release */, </s> remove 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> ); <mask> buildRules = ( <mask> ); <mask> dependencies = ( <mask> 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, <mask> ); <mask> name = EXRandom; <mask> productName = EXRandom; <mask> productReference = ABA839BF6EF1B661F43A935E0835C42B /* libEXRandom.a */; <mask> productType = "com.apple.product-type.library.static"; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */, 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */, E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 413A76996CF33CEF683471A45AC655E9 /* Headers */, 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */, BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> remove name = UMCore; targetProxy = 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> productRefGroup = 600BD6871B5DA12DF656FA3C6572A3B5 /* Products */; <mask> projectDirPath = ""; <mask> projectReferences = ( <mask> { <mask> ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; <mask> }, <mask> ); <mask> projectRoot = ""; <mask> targets = ( <mask> 00EB4A6BB9778AFFF7F587D732973596 /* EXRandom */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */; </s> remove baseConfigurationReference = 779CD56F5BF18E1ADC18904FEE959D4A /* EXRandom.release.xcconfig */; </s> add baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_MODULE_NAME = EXRandom; PRODUCT_NAME = EXRandom; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; </s> add </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep replace keep keep keep replace replace
<mask> /* Begin PBXSourcesBuildPhase section */ <mask> 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { <mask> isa = PBXSourcesBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, <mask> 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */, 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 738B1A376EFF56FBAB8B0CA54A1C24B6 /* EXRandom.m */; }; 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */; }; A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C895A037BDF05259C9F964D5FDCA0E0 /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 738B1A376EFF56FBAB8B0CA54A1C24B6 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C895A037BDF05259C9F964D5FDCA0E0 /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> remove A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */, </s> add 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace keep replace replace keep keep keep
<mask> /* End PBXSourcesBuildPhase section */ <mask> <mask> /* Begin PBXTargetDependency section */ <mask> 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */ = { <mask> isa = PBXTargetDependency; <mask> name = UMCore; <mask> targetProxy = 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */; <mask> }; <mask> /* End PBXTargetDependency section */ <mask> </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */ = { </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */ = { </s> remove name = UMCore; targetProxy = 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */; </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */; </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> SYMROOT = "${SRCROOT}/../build"; <mask> }; <mask> name = Release; <mask> }; <mask> A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */ = { <mask> isa = XCBuildConfiguration; <mask> baseConfigurationReference = 7C5A1A1C5498A4D797BC312930AD84C5 /* EXRandom.debug.xcconfig */; <mask> buildSettings = { <mask> CLANG_ENABLE_OBJC_WEAK = NO; <mask> CODE_SIGN_IDENTITY = "iPhone Developer"; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove DFEA9A646AAC3AA991D090754F659CAE /* Release */ = { </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */ = { </s> remove baseConfigurationReference = 779CD56F5BF18E1ADC18904FEE959D4A /* EXRandom.release.xcconfig */; </s> add baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; </s> remove 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_MODULE_NAME = EXRandom; PRODUCT_NAME = EXRandom; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; </s> add </s> remove AEB1C5A213013ACFB4F142E31875E30F /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5063B1618AB21EA03BA6C0EE5C560E9D /* EXRandom.release.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_MODULE_NAME = EXRandom; PRODUCT_NAME = EXRandom; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; }; </s> add </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, AEB1C5A213013ACFB4F142E31875E30F /* Release */, </s> add 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep replace keep keep
<mask> TARGETED_DEVICE_FAMILY = "1,2"; <mask> }; <mask> name = Debug; <mask> }; <mask> AEB1C5A213013ACFB4F142E31875E30F /* Release */ = { <mask> isa = XCBuildConfiguration; <mask> baseConfigurationReference = 5063B1618AB21EA03BA6C0EE5C560E9D /* EXRandom.release.xcconfig */; <mask> buildSettings = { <mask> CLANG_ENABLE_OBJC_WEAK = NO; <mask> CODE_SIGN_IDENTITY = "iPhone Developer"; <mask> "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; <mask> "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; <mask> "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; <mask> GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; <mask> IPHONEOS_DEPLOYMENT_TARGET = 10.0; <mask> OTHER_LDFLAGS = ""; <mask> OTHER_LIBTOOLFLAGS = ""; <mask> PRIVATE_HEADERS_FOLDER_PATH = ""; <mask> PRODUCT_MODULE_NAME = EXRandom; <mask> PRODUCT_NAME = EXRandom; <mask> PUBLIC_HEADERS_FOLDER_PATH = ""; <mask> SDKROOT = iphoneos; <mask> SKIP_INSTALL = YES; <mask> SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; <mask> SWIFT_VERSION = 5.0; <mask> TARGETED_DEVICE_FAMILY = "1,2"; <mask> VALIDATE_PRODUCT = YES; <mask> }; <mask> name = Release; <mask> }; <mask> /* End XCBuildConfiguration section */ <mask> <mask> /* Begin XCConfigurationList section */ <mask> DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { <mask> isa = XCConfigurationList; <mask> buildConfigurations = ( </s> [expo-random] Add sync equivalents for expo-random methods (#9750)
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace replace keep keep keep keep replace keep
<mask> DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { <mask> isa = XCConfigurationList; <mask> buildConfigurations = ( <mask> 300933D08555CB7EDD3E961A886E0E71 /* Debug */, <mask> 7E3223FFA731463206A0217DA17610E5 /* Release */, <mask> ); <mask> defaultConfigurationIsVisible = 0; <mask> defaultConfigurationName = Release; <mask> }; <mask> DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { <mask> isa = XCConfigurationList; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */, DFEA9A646AAC3AA991D090754F659CAE /* Release */, </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */, 7045DB3ABDD227D30A1753624D0021F7 /* Release */, </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, AEB1C5A213013ACFB4F142E31875E30F /* Release */, </s> add 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> remove DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> remove 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> remove buildConfigurationList = DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> add buildConfigurationList = 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace replace keep keep keep keep keep
<mask> }; <mask> DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { <mask> isa = XCConfigurationList; <mask> buildConfigurations = ( <mask> A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, <mask> AEB1C5A213013ACFB4F142E31875E30F /* Release */, <mask> ); <mask> defaultConfigurationIsVisible = 0; <mask> defaultConfigurationName = Release; <mask> }; <mask> /* End XCConfigurationList section */ </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { </s> remove 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */, 7045DB3ABDD227D30A1753624D0021F7 /* Release */, </s> remove 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */, DFEA9A646AAC3AA991D090754F659CAE /* Release */, </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */, 7045DB3ABDD227D30A1753624D0021F7 /* Release */, </s> remove 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> remove DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> remove buildConfigurationList = DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> add buildConfigurationList = 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/bare-expo/ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep add keep keep keep keep
<mask> "expo-processing": "2.0.2", <mask> "expo-progress": "^0.0.2", <mask> "expo-secure-store": "~9.2.0", <mask> "expo-sensors": "~9.1.0", <mask> "expo-sharing": "~8.3.0", <mask> "expo-sms": "~8.3.0", </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, AEB1C5A213013ACFB4F142E31875E30F /* Release */, </s> add 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */; </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */ = { </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/native-component-list/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> "react-navigation-stack": "^2.8.2", <mask> "regl": "^1.3.0", <mask> "three": "^0.115.0", <mask> "url": "^0.11.0", <mask> "uuid": "^3.1.0", <mask> "victory-native": "^30.4.0" <mask> }, <mask> "devDependencies": { <mask> "@types/i18n-js": "^3.0.1", <mask> "@types/pixi.js": "^4.8.6", </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove "unimodulePeerDependencies": { "@unimodules/core": "*" }, </s> add </s> add ExpoRandom: { getRandomBase64StringAsync: { type: 'function', functionType: 'promise' }, getRandomBase64String: { type: 'function' }, }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove ExpoRandom: [{ key: 0, argumentsCount: 1, name: 'getRandomBase64StringAsync' }], </s> add </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array);
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/native-component-list/package.json
keep keep keep add keep keep keep keep
<mask> const Notification = optionalRequire(() => require('../screens/NotificationScreen')); <mask> const Pedometer = optionalRequire(() => require('../screens/PedometerScreen')); <mask> const Permissions = optionalRequire(() => require('../screens/PermissionsScreen')); <mask> const Print = optionalRequire(() => require('../screens/PrintScreen')); <mask> const Recording = optionalRequire(() => require('../screens/AV/RecordingScreen')); <mask> const Reminders = optionalRequire(() => require('../screens/RemindersScreen')); <mask> const SafeAreaContext = optionalRequire(() => require('../screens/SafeAreaContextScreen')); <mask> const ScreenOrientation = optionalRequire(() => require('../screens/ScreenOrientationScreen')); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add export function getRandomBytes(byteCount: number): Uint8Array { assertByteCount(byteCount, 'getRandomBytes'); const validByteCount = Math.floor(byteCount); if (ExpoRandom.getRandomBytes) { return ExpoRandom.getRandomBytes(validByteCount); } else if (ExpoRandom.getRandomBase64String) { const base64 = ExpoRandom.getRandomBase64String(validByteCount); return toByteArray(base64); } else { throw new UnavailabilityError('expo-random', 'getRandomBytes'); } } </s> remove assertByteCount(byteCount); </s> add assertByteCount(byteCount, 'getRandomBytesAsync'); </s> add getRandomBytes(length) { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> add getRandomBytes(length: number): Uint8Array { const array = new Uint8Array(length); // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array); }, </s> remove throw new TypeError(`expo-random: getRandomBytesAsync(${value}) expected a valid number from range 0...1024`); </s> add throw new TypeError(`expo-random: ${methodName}(${value}) expected a valid number from range 0...1024`); } } export function getRandomBytes(byteCount) { assertByteCount(byteCount, 'getRandomBytes'); const validByteCount = Math.floor(byteCount); if (ExpoRandom.getRandomBytes) { return ExpoRandom.getRandomBytes(validByteCount); } else if (ExpoRandom.getRandomBase64String) { const base64 = ExpoRandom.getRandomBase64String(validByteCount); return toByteArray(base64); } else { throw new UnavailabilityError('expo-random', 'getRandomBytes'); </s> remove return window.crypto.getRandomValues(array); </s> add // @ts-ignore return (window.crypto ?? window.msCrypto).getRandomValues(array);
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/native-component-list/src/navigation/ExpoApis.ts
keep keep add keep keep keep keep
<mask> Permissions, <mask> Print, <mask> Recording, <mask> Reminders, <mask> SafeAreaContext, <mask> ScreenOrientation, <mask> SecureStore, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove ExpoRandom: [{ key: 0, argumentsCount: 1, name: 'getRandomBase64StringAsync' }], </s> add </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, AEB1C5A213013ACFB4F142E31875E30F /* Release */, </s> add 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */; </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/native-component-list/src/navigation/ExpoApis.ts
keep keep keep add keep keep keep keep keep keep
<mask> 'Notification', <mask> 'Pedometer', <mask> 'Permissions', <mask> 'Print', <mask> 'Recording', <mask> 'SMS', <mask> 'SafeAreaContext', <mask> 'ScreenOrientation', <mask> 'SecureStore', <mask> 'Sensor', </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove ExpoRandom: [{ key: 0, argumentsCount: 1, name: 'getRandomBase64StringAsync' }], </s> add </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */, AEB1C5A213013ACFB4F142E31875E30F /* Release */, </s> add 300933D08555CB7EDD3E961A886E0E71 /* Debug */, 7E3223FFA731463206A0217DA17610E5 /* Release */, </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */; </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
apps/native-component-list/src/screens/ExpoApisScreen.tsx
keep keep keep add keep keep keep keep keep keep
<mask> :inhibit_warnings => false <mask> } <mask> }) <mask> <mask> # Unversioned React Native <mask> use_react_native! path: '../react-native-lab/react-native' <mask> <mask> # Evaluate all files matching `versioned-react-native/ABI*/dependencies.rb` glob pattern <mask> # and install ReactABIXX_0_0 pods with all versioned unimodules. <mask> use_versioned_abis! </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add pod 'EXRandom', path: '../../../packages/expo-random/ios' </s> remove if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) { apply from: project(":unimodules-core").file("../unimodules-core.gradle") } else { throw new GradleException( "'unimodules-core.gradle' was not found in the usual Flutter or React Native dependency locations. " + "This package can only be used in such projects. Are you sure you've installed the dependencies properly?") } </s> add </s> add const Random = optionalRequire(() => require('../screens/RandomScreen')); </s> remove @Override public void onCreate(ModuleRegistry moduleRegistry) { if (moduleRegistry != null) { mRandom = new SecureRandom(); } } </s> add </s> add export function getRandomBytes(byteCount: number): Uint8Array { assertByteCount(byteCount, 'getRandomBytes'); const validByteCount = Math.floor(byteCount); if (ExpoRandom.getRandomBytes) { return ExpoRandom.getRandomBytes(validByteCount); } else if (ExpoRandom.getRandomBase64String) { const base64 = ExpoRandom.getRandomBase64String(validByteCount); return toByteArray(base64); } else { throw new UnavailabilityError('expo-random', 'getRandomBytes'); } } </s> remove @ExpoMethod public void getRandomBase64StringAsync(int randomByteCount, final Promise promise) { </s> add @ReactMethod public void getRandomBase64StringAsync(int randomByteCount, Promise promise) { promise.resolve(getRandomBase64String(randomByteCount)); } @ReactMethod(isBlockingSynchronousMethod = true) public String getRandomBase64String(int randomByteCount) { if (mSecureRandom == null) { mSecureRandom = new SecureRandom(); }
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Podfile
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> - EXPrint (9.0.2) <mask> EXRandom: <mask> BUILD_SETTINGS_CHECKSUM: <mask> EXRandom: <mask> :debug: 09dc0cb0d42b4b64abf3c5c763a954bf <mask> :release: 09dc0cb0d42b4b64abf3c5c763a954bf <mask> CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 <mask> FILES: <mask> - "../../packages/expo-random/ios/EXRandom/EXRandom.h" <mask> - "../../packages/expo-random/ios/EXRandom/EXRandom.m" <mask> PROJECT_NAME: EXRandom <mask> SPECS: </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove :debug: ff6c0d51873fcc617a9b0822d664f413 :release: ff6c0d51873fcc617a9b0822d664f413 CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: c8cd2f6f0ffc63ec50d5d281845c43d7 :release: c8cd2f6f0ffc63ec50d5d281845c43d7 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> remove Debug: 9184484a21be9ed9a9f876300d40939b Release: 9184484a21be9ed9a9f876300d40939b </s> add Debug: 76816b7215772a4870f549c2b493264f Release: 76816b7215772a4870f549c2b493264f </s> remove Debug: a1d9aab80ff7dae91b622a89156ed852 Release: a1d9aab80ff7dae91b622a89156ed852 </s> add Debug: 43b2d98bf58cabcae557565e34d424cb Release: 43b2d98bf58cabcae557565e34d424cb </s> add #pragma mark - Internal methods - (NSString *)_getRandomBase64String:(NSUInteger)length error:(NSError **)error { NSMutableData *bytes = [NSMutableData dataWithLength:length]; OSStatus result = SecRandomCopyBytes(kSecRandomDefault, length, [bytes mutableBytes]); if (result == errSecSuccess) { return [bytes base64EncodedStringWithOptions:0]; } else if (error) { *error = [NSError errorWithDomain:@"expo-random" code:result userInfo:nil]; } return nil; } </s> remove #import <UMCore/UMModuleRegistry.h> #import <UIKit/UIKit.h> @interface EXRandom : UMExportedModule </s> add @interface EXRandom : NSObject <RCTBridgeModule> </s> remove // Copyright 2019-present 650 Industries. All rights reserved. </s> add #if __has_include("RCTBridgeModule.h") #import "RCTBridgeModule.h" #else #import <React/RCTBridgeModule.h> #endif
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/.project_cache/installation_cache.yaml
keep keep keep keep replace replace keep keep keep keep keep
<mask> - nanopb/decode (0.3.9011) <mask> - nanopb/encode (0.3.9011) <mask> Pods-Exponent: <mask> BUILD_SETTINGS_CHECKSUM: <mask> Debug: a1d9aab80ff7dae91b622a89156ed852 <mask> Release: a1d9aab80ff7dae91b622a89156ed852 <mask> FILES: <mask> - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMLVisionFaceModel/GoogleMVFaceDetectorResources.bundle" <mask> - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle" <mask> - "${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der" <mask> - "${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der" </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove Debug: 9184484a21be9ed9a9f876300d40939b Release: 9184484a21be9ed9a9f876300d40939b </s> add Debug: 76816b7215772a4870f549c2b493264f Release: 76816b7215772a4870f549c2b493264f </s> remove :debug: ff6c0d51873fcc617a9b0822d664f413 :release: ff6c0d51873fcc617a9b0822d664f413 CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: c8cd2f6f0ffc63ec50d5d281845c43d7 :release: c8cd2f6f0ffc63ec50d5d281845c43d7 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> remove :debug: 09dc0cb0d42b4b64abf3c5c763a954bf :release: 09dc0cb0d42b4b64abf3c5c763a954bf CHECKSUM: a375fb6bed8a0919a795766b8d5218b1200538b7 </s> add :debug: cf0fc244a5cff207ba734b93651c9754 :release: cf0fc244a5cff207ba734b93651c9754 CHECKSUM: 9af668c0f6460e52c4d83779b84bfd666e42dd38 </s> add #pragma mark - Internal methods - (NSString *)_getRandomBase64String:(NSUInteger)length error:(NSError **)error { NSMutableData *bytes = [NSMutableData dataWithLength:length]; OSStatus result = SecRandomCopyBytes(kSecRandomDefault, length, [bytes mutableBytes]); if (result == errSecSuccess) { return [bytes base64EncodedStringWithOptions:0]; } else if (error) { *error = [NSError errorWithDomain:@"expo-random" code:result userInfo:nil]; } return nil; } </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */ = { </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */ = { </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/.project_cache/installation_cache.yaml
keep keep keep keep replace replace replace keep keep keep replace
<mask> objectVersion = 46; <mask> objects = { <mask> <mask> /* Begin PBXBuildFile section */ <mask> 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; <mask> 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; <mask> 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; }; <mask> /* End PBXBuildFile section */ <mask> <mask> /* Begin PBXContainerItemProxy section */ <mask> 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */ = { </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 738B1A376EFF56FBAB8B0CA54A1C24B6 /* EXRandom.m */; }; 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */; }; A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C895A037BDF05259C9F964D5FDCA0E0 /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D0B21C5273B39793C5888E56269885 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = 738B1A376EFF56FBAB8B0CA54A1C24B6 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C895A037BDF05259C9F964D5FDCA0E0 /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> remove 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */, 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep replace keep replace replace keep keep
<mask> isa = PBXContainerItemProxy; <mask> containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; <mask> proxyType = 1; <mask> remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; <mask> remoteInfo = UMCore; <mask> }; <mask> /* End PBXContainerItemProxy section */ </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */; </s> remove 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = { </s> remove name = UMCore; targetProxy = 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> 779CD56F5BF18E1ADC18904FEE959D4A /* EXRandom.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = EXRandom.release.xcconfig; sourceTree = "<group>"; }; <mask> 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "EXRandom-dummy.m"; sourceTree = "<group>"; }; <mask> ABA839BF6EF1B661F43A935E0835C42B /* libEXRandom.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libEXRandom.a; path = libEXRandom.a; sourceTree = BUILT_PRODUCTS_DIR; }; <mask> B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EXRandom.m; path = EXRandom/EXRandom.m; sourceTree = "<group>"; }; <mask> D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; <mask> E396195E7EADBFFCB015571C731148DF /* EXRandom-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "EXRandom-prefix.pch"; sourceTree = "<group>"; }; <mask> E52F8EB47E1DF969770D020770A136C1 /* EXRandom.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = EXRandom.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; <mask> /* End PBXFileReference section */ <mask> <mask> /* Begin PBXFrameworksBuildPhase section */ </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> remove BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep add keep keep keep keep keep
<mask> E396195E7EADBFFCB015571C731148DF /* EXRandom-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "EXRandom-prefix.pch"; sourceTree = "<group>"; }; <mask> E52F8EB47E1DF969770D020770A136C1 /* EXRandom.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = EXRandom.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; <mask> /* End PBXFileReference section */ <mask> <mask> /* Begin PBXFrameworksBuildPhase section */ <mask> F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { <mask> isa = PBXFrameworksBuildPhase; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add </s> remove BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> remove E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> E52F8EB47E1DF969770D020770A136C1 /* EXRandom.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = EXRandom.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; <mask> /* End PBXFileReference section */ <mask> <mask> /* Begin PBXFrameworksBuildPhase section */ <mask> BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */ = { <mask> isa = PBXFrameworksBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> ); <mask> runOnlyForDeploymentPostprocessing = 0; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React; </s> remove E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */ = { </s> add F0256F54D0C6225A6C556908D019455D /* Frameworks */ = { </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add FDCA8F549D32EB7E5A41359356DA801D /* React */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React; path = React.xcodeproj; sourceTree = "<group>"; }; </s> remove remoteGlobalIDString = 153171642F5C5CBC05FD3EF6B23A3F36; remoteInfo = UMCore; </s> add remoteGlobalIDString = 94DA87F24FB4B93E5D08FE961D5E5A3E; remoteInfo = React;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep add keep keep keep keep keep keep
<mask> name = Frameworks; <mask> sourceTree = "<group>"; <mask> }; <mask> 51DC8986620281F78F14AB6594F6AA27 /* Support Files */ = { <mask> isa = PBXGroup; <mask> children = ( <mask> 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */, <mask> E396195E7EADBFFCB015571C731148DF /* EXRandom-prefix.pch */, <mask> 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = UMCore; path = UMCore.xcodeproj; sourceTree = "<group>"; }; </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace replace replace replace replace replace replace replace keep keep keep replace keep keep keep
<mask> name = Products; <mask> sourceTree = "<group>"; <mask> }; <mask> 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { <mask> isa = PBXGroup; <mask> children = ( <mask> D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, <mask> ); <mask> name = Dependencies; <mask> sourceTree = "<group>"; <mask> }; <mask> EF3248404F968B773E287A4D87F4BEF4 = { <mask> isa = PBXGroup; <mask> children = ( <mask> 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, <mask> 3725D91E2217E0578507A50762D70F7D /* EXRandom */, <mask> 389259836FBA79F409DA40FEE4D80FA0 /* Frameworks */, <mask> 600BD6871B5DA12DF656FA3C6572A3B5 /* Products */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */, </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; </s> add ProjectRef = FDCA8F549D32EB7E5A41359356DA801D /* React */;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep replace keep
<mask> }; <mask> /* End PBXGroup section */ <mask> <mask> /* Begin PBXHeadersBuildPhase section */ <mask> 413A76996CF33CEF683471A45AC655E9 /* Headers */ = { <mask> isa = PBXHeadersBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */, <mask> ); </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */ = { </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */ = { </s> remove A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */, </s> add 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */, </s> remove 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; };
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep replace keep replace replace replace
<mask> isa = PBXNativeTarget; <mask> buildConfigurationList = 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */; <mask> buildPhases = ( <mask> 413A76996CF33CEF683471A45AC655E9 /* Headers */, <mask> 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */, <mask> BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove buildConfigurationList = DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> add buildConfigurationList = 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */; </s> remove 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */, 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */, E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> remove 9F9B00B953B16BEFB7A472A49D295319 /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add 36A85DEC73C5B4E48FEB3E2CE2A26F3C /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> remove 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */, DFEA9A646AAC3AA991D090754F659CAE /* Release */, </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */, 7045DB3ABDD227D30A1753624D0021F7 /* Release */, </s> remove DDBF30326786AD4461D96B57BDD17EAE /* Build configuration list for PBXNativeTarget "EXRandom" */ = { </s> add DA6318F3F1C1D240A40D56C5915E8F3F /* Build configuration list for PBXProject "EXRandom" */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> ); <mask> buildRules = ( <mask> ); <mask> dependencies = ( <mask> A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */, <mask> ); <mask> name = EXRandom; <mask> productName = EXRandom; <mask> productReference = ABA839BF6EF1B661F43A935E0835C42B /* libEXRandom.a */; <mask> productType = "com.apple.product-type.library.static"; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove 413A76996CF33CEF683471A45AC655E9 /* Headers */, 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */, BEAE2C6354B1523C06C77E85A0038A4A /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> add 4B2CF50C97A9D9CBC0704814DD7C993F /* Dependencies */ = { isa = PBXGroup; children = ( FDCA8F549D32EB7E5A41359356DA801D /* React */, ); name = Dependencies; sourceTree = "<group>"; }; </s> remove 51620F6BB5B06E52431176DF0EB9F5D7 /* Headers */, 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */, E0E2213A818B8FF71D4F49202BF74CF9 /* Frameworks */, </s> add 1A5E357382B0273D3C8E350BA00ADFF3 /* Headers */, D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */, F0256F54D0C6225A6C556908D019455D /* Frameworks */, </s> remove name = UMCore; targetProxy = 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */; </s> remove 74A99FCD67A915A6C442AFE5A23E524A /* Dependencies */ = { isa = PBXGroup; children = ( D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */, ); name = Dependencies; sourceTree = "<group>"; }; </s> add
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace keep keep keep keep keep
<mask> productRefGroup = 600BD6871B5DA12DF656FA3C6572A3B5 /* Products */; <mask> projectDirPath = ""; <mask> projectReferences = ( <mask> { <mask> ProjectRef = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore */; <mask> }, <mask> ); <mask> projectRoot = ""; <mask> targets = ( <mask> 00EB4A6BB9778AFFF7F587D732973596 /* EXRandom */, </s> [expo-random] Add sync equivalents for expo-random methods (#9750)
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep replace keep keep keep replace replace keep keep
<mask> /* End PBXProject section */ <mask> <mask> /* Begin PBXSourcesBuildPhase section */ <mask> 3019E3CDF556F4AD30EA00DED0B45EC6 /* Sources */ = { <mask> isa = PBXSourcesBuildPhase; <mask> buildActionMask = 2147483647; <mask> files = ( <mask> 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */, <mask> 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */, <mask> ); <mask> runOnlyForDeploymentPostprocessing = 0; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove 25D2D9F8A57C776500F4F44D6CB4E1F2 /* EXRandom-dummy.m in Sources */, 02221D0E8981088B837691D59AE07B89 /* EXRandom.m in Sources */, </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */, 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */, </s> remove 16507D9EF7E3257F04C28CBE6F7A384D /* Sources */ = { </s> add D37FFF0DCD3D17DBB65BCA36753A22BA /* Sources */ = { </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; 7E9E9E60D6714E946FC8719D6ECD5C46 /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 91F5F55ACE938806C5BA42D0DFE90CB5 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; }; </s> add 05CEDE34E00CEF84445D8049960314AD /* EXRandom-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9872F246FA16A5C5C6D5987C26B812D9 /* EXRandom-dummy.m */; }; 14EAFB29B871633E638DE6E77C603A37 /* EXRandom.m in Sources */ = {isa = PBXBuildFile; fileRef = B426262711636D8D1E0F6F11B03781C9 /* EXRandom.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 232C3A11B38832A13CB055F69420FD8C /* EXRandom.h */; settings = {ATTRIBUTES = (Project, ); }; }; </s> remove A2403BD2CFBC7227FE69DBB6B363A54F /* EXRandom.h in Headers */, </s> add 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */, </s> remove 424DF9B5616FF75672E8C02408CF7D0F /* EXRandom.h in Headers */, </s> add 4C9A17CE833C89D845C2CA7DC694C76C /* EXRandom.h in Headers */,
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep replace keep replace replace keep
<mask> <mask> /* Begin PBXTargetDependency section */ <mask> A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */ = { <mask> isa = PBXTargetDependency; <mask> name = UMCore; <mask> targetProxy = 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */; <mask> }; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove name = UMCore; targetProxy = 2BCB86AB2FE88981E79B828B49578FB4 /* PBXContainerItemProxy */; </s> add name = React; targetProxy = C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */; </s> remove 81C6651125A3AEF5E2336E2A78BADC07 /* PBXTargetDependency */ = { </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */ = { </s> remove containerPortal = D6ADFE68665AAE170EAF262C8B848B14 /* UMCore.xcodeproj */; </s> add containerPortal = FDCA8F549D32EB7E5A41359356DA801D /* React.xcodeproj */; </s> remove A4BA194510FE478E84D6AF85008E9BFE /* PBXTargetDependency */, </s> add D04A0E8F2CF02CEC6EF5D985D8755793 /* PBXTargetDependency */, </s> remove 71A467F5311C64AA39D9D6DC6A8E28CE /* PBXContainerItemProxy */ = { </s> add C0971CF7C0B74D3E53AF8EF8D1551347 /* PBXContainerItemProxy */ = {
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> }; <mask> /* End PBXTargetDependency section */ <mask> <mask> /* Begin XCBuildConfiguration section */ <mask> 0C54F6831DCA3BEC36AF70BA1FE695D8 /* Debug */ = { <mask> isa = XCBuildConfiguration; <mask> baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; <mask> buildSettings = { <mask> CLANG_ENABLE_OBJC_WEAK = NO; <mask> CODE_SIGN_IDENTITY = "iPhone Developer"; <mask> "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; <mask> "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; <mask> "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; <mask> GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; <mask> IPHONEOS_DEPLOYMENT_TARGET = 10.0; <mask> OTHER_LDFLAGS = ""; <mask> OTHER_LIBTOOLFLAGS = ""; <mask> PRIVATE_HEADERS_FOLDER_PATH = ""; <mask> PRODUCT_MODULE_NAME = EXRandom; <mask> PRODUCT_NAME = EXRandom; <mask> PUBLIC_HEADERS_FOLDER_PATH = ""; <mask> SDKROOT = iphoneos; <mask> SKIP_INSTALL = YES; <mask> SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; <mask> SWIFT_VERSION = 5.0; <mask> TARGETED_DEVICE_FAMILY = "1,2"; <mask> }; <mask> name = Debug; <mask> }; <mask> 300933D08555CB7EDD3E961A886E0E71 /* Debug */ = { <mask> isa = XCBuildConfiguration; <mask> buildSettings = { <mask> ALWAYS_SEARCH_USER_PATHS = NO; <mask> CLANG_ANALYZER_NONNULL = YES; </s> [expo-random] Add sync equivalents for expo-random methods (#9750) </s> remove AEB1C5A213013ACFB4F142E31875E30F /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5063B1618AB21EA03BA6C0EE5C560E9D /* EXRandom.release.xcconfig */; buildSettings = { CLANG_ENABLE_OBJC_WEAK = NO; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; GCC_PREFIX_HEADER = "Target Support Files/EXRandom/EXRandom-prefix.pch"; IPHONEOS_DEPLOYMENT_TARGET = 10.0; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PRIVATE_HEADERS_FOLDER_PATH = ""; PRODUCT_MODULE_NAME = EXRandom; PRODUCT_NAME = EXRandom; PUBLIC_HEADERS_FOLDER_PATH = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; name = Release; }; </s> add </s> remove baseConfigurationReference = 779CD56F5BF18E1ADC18904FEE959D4A /* EXRandom.release.xcconfig */; </s> add baseConfigurationReference = 1C7A324C557D5242205C0775EFE3EB37 /* EXRandom.debug.xcconfig */; </s> remove A93B1BA1A49DEC799A8BA508D155F0D3 /* Debug */ = { </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */ = { </s> remove VALIDATE_PRODUCT = YES; </s> add </s> remove DFEA9A646AAC3AA991D090754F659CAE /* Release */ = { </s> add 8ED9F549BC989B7DDEB5FBA6A4E01B6B /* Debug */ = { </s> remove name = Release; </s> add name = Debug;
https://github.com/expo/expo/commit/3571d4149c977e8d7997dbe00fe4ea58d731b3db
ios/Pods/EXRandom.xcodeproj/project.pbxproj