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 keep replace keep keep keep keep keep
|
<mask> {this.actionManager.renderAction(
<mask> "saveScene",
<mask> elements,
<mask> this.state,
<mask> this.syncActionResult
<mask> )}
<mask> <ExportDialog
<mask> elements={elements}
<mask> appState={this.state}
<mask> actionManager={this.actionManager}
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> {this.actionManager.renderAction(
<mask> "clearCanvas",
<mask> elements,
<mask> this.state,
<mask> this.syncActionResult
<mask> )}
<mask> </Stack.Row>
<mask> {this.actionManager.renderAction(
<mask> "changeViewBackgroundColor",
<mask> elements,
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> {this.actionManager.renderAction(
<mask> "changeViewBackgroundColor",
<mask> elements,
<mask> this.state,
<mask> this.syncActionResult
<mask> )}
<mask> </Stack.Col>
<mask> );
<mask> }
<mask>
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove this.syncActionResult
</s> add this.syncActionResult,
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep add keep keep keep keep
|
<mask> const canvasWidth = window.innerWidth - CANVAS_WINDOW_OFFSET_LEFT;
<mask> const canvasHeight = window.innerHeight - CANVAS_WINDOW_OFFSET_TOP;
<mask>
<mask> return (
<mask> <div className="container">
<mask> <FixedSideContainer side="top">
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove export class App extends React.Component<{}, AppState> {
</s> add export class App extends React.Component<any, AppState> { </s> add const { t } = useTranslation(); </s> add const { t } = this.props;
</s> add const { t } = this.props; </s> add const AppWithTrans = withTranslation()(App);
</s> add const { t } = this.props;
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (!element) {
<mask> ContextMenu.push({
<mask> options: [
<mask> navigator.clipboard && {
<mask> label: "Paste",
<mask> action: () => this.pasteFromClipboard()
<mask> },
<mask> ...this.actionManager.getContextMenuItems(
<mask> elements,
<mask> this.state,
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove label: "Copy",
</s> add label: t("labels.copy"), </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove label: action.contextItemLabel!,
</s> add label:
t && action.contextItemLabel
? t(action.contextItemLabel)
: action.contextItemLabel!, </s> add import { useTranslation } from "react-i18next";
</s> remove action => !this.canvasOnlyActions.includes(action)
</s> add action => !this.canvasOnlyActions.includes(action),
t </s> remove action => this.canvasOnlyActions.includes(action)
</s> add action => this.canvasOnlyActions.includes(action),
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ...this.actionManager.getContextMenuItems(
<mask> elements,
<mask> this.state,
<mask> this.syncActionResult,
<mask> action => this.canvasOnlyActions.includes(action)
<mask> )
<mask> ],
<mask> top: e.clientY,
<mask> left: e.clientX
<mask> });
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove action => !this.canvasOnlyActions.includes(action)
</s> add action => !this.canvasOnlyActions.includes(action),
t </s> remove actionFilter: ActionFilterFn = action => action
</s> add actionFilter: ActionFilterFn = action => action,
t?: TFunction </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove this.syncActionResult
</s> add this.syncActionResult,
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep replace keep keep keep replace keep keep keep keep
|
<mask> ContextMenu.push({
<mask> options: [
<mask> navigator.clipboard && {
<mask> label: "Copy",
<mask> action: this.copyToClipboard
<mask> },
<mask> navigator.clipboard && {
<mask> label: "Paste",
<mask> action: () => this.pasteFromClipboard()
<mask> },
<mask> ...this.actionManager.getContextMenuItems(
<mask> elements,
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove label: action.contextItemLabel!,
</s> add label:
t && action.contextItemLabel
? t(action.contextItemLabel)
: action.contextItemLabel!, </s> add import { useTranslation } from "react-i18next";
</s> remove { value: "Virgil", text: "Hand-drawn" },
{ value: "Helvetica", text: "Normal" },
{ value: "Cascadia", text: "Code" }
</s> add { value: "Virgil", text: t("labels.handDrawn") },
{ value: "Helvetica", text: t("labels.normal") },
{ value: "Cascadia", text: t("labels.code") } </s> remove contextItemLabel: "Send to Back",
</s> add contextItemLabel: "labels.sendToBack",
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ...this.actionManager.getContextMenuItems(
<mask> elements,
<mask> this.state,
<mask> this.syncActionResult,
<mask> action => !this.canvasOnlyActions.includes(action)
<mask> )
<mask> ],
<mask> top: e.clientY,
<mask> left: e.clientX
<mask> });
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove action => this.canvasOnlyActions.includes(action)
</s> add action => this.canvasOnlyActions.includes(action),
t </s> remove actionFilter: ActionFilterFn = action => action
</s> add actionFilter: ActionFilterFn = action => action,
t?: TFunction </s> remove this.syncActionResult
</s> add this.syncActionResult,
t </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove label: "Paste",
</s> add label: t("labels.paste"), </s> remove this.syncActionResult
</s> add this.syncActionResult,
t
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep add keep keep
|
<mask> }
<mask> }
<mask> }
<mask>
<mask> const rootElement = document.getElementById("root");
<mask> ReactDOM.render(<AppWithTrans />, rootElement);
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> remove ReactDOM.render(<App />, rootElement);
</s> add ReactDOM.render(<AppWithTrans />, rootElement); </s> add const { t } = this.props; </s> add import { withTranslation } from "react-i18next";
import "./i18n"; </s> add const { t } = useTranslation(); </s> add const { t } = this.props; </s> add const { t } = this.props;
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep keep replace
|
<mask> }
<mask> }
<mask>
<mask> const rootElement = document.getElementById("root");
<mask> ReactDOM.render(<App />, rootElement);
</s> Internationalization support (#477)
* add i18next lib
add some translations
* add translations
* fix font-family
* fix pin versions </s> add const AppWithTrans = withTranslation()(App);
</s> add const { t } = this.props; </s> add const { t } = useTranslation(); </s> add import { withTranslation } from "react-i18next";
import "./i18n"; </s> add const { t } = this.props; </s> add const { t } = this.props;
|
https://github.com/excalidraw/excalidraw/commit/ff7a340d2fc24b75a7cbf265de5eae2d841e88df
|
src/index.tsx
|
keep keep keep add keep keep keep keep keep keep
|
<mask> scale,
<mask> shouldAddWatermark,
<mask> });
<mask> tempCanvas.style.display = "none";
<mask>
<mask> if (type === "png") {
<mask> const fileName = `${name}.png`;
<mask> tempCanvas.toBlob(async (blob: any) => {
<mask> if (blob) {
<mask> await fileSave(blob, {
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/data/index.ts
|
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> import { Drawable, Options } from "roughjs/bin/core";
<mask> import { RoughSVG } from "roughjs/bin/svg";
<mask> import { RoughGenerator } from "roughjs/bin/generator";
<mask> import { SceneState } from "../scene/types";
<mask> import {
<mask> SVG_NS,
<mask> distance,
<mask> getFontString,
<mask> getFontFamilyString,
<mask> isRTL,
<mask> } from "../utils";
<mask> import { isPathALoop } from "../math";
<mask> import rough from "roughjs/bin/rough";
<mask>
<mask> const CANVAS_PADDING = 20;
<mask>
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove text.setAttribute("direction", direction);
</s> add </s> remove
// Clear the nested element we appended to the DOM
const node = document.querySelector("#nested-canvas-element");
if (node && node.parentNode) {
node.parentNode.removeChild(node);
}
</s> add </s> remove horizontalOffset,
</s> add 0 + horizontalOffset,
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> ): ExcalidrawElementWithCanvas => {
<mask> const canvas = document.createElement("canvas");
<mask> const context = canvas.getContext("2d")!;
<mask>
<mask> // To be able to draw a nested element with RTL, we have to append it to the DOM
<mask> canvas.style.display = "none";
<mask> canvas.id = "nested-canvas-element";
<mask> document.body.appendChild(canvas);
<mask>
<mask> let canvasOffsetX = 0;
<mask> let canvasOffsetY = 0;
<mask>
<mask> if (isLinearElement(element)) {
<mask> const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove
// Clear the nested element we appended to the DOM
const node = document.querySelector("#nested-canvas-element");
if (node && node.parentNode) {
node.parentNode.removeChild(node);
}
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> add document.body.appendChild(tempCanvas); </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> break;
<mask> }
<mask> default: {
<mask> if (isTextElement(element)) {
<mask> context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
<mask> const font = context.font;
<mask> context.font = getFontString(element);
<mask> const fillStyle = context.fillStyle;
<mask> context.fillStyle = element.strokeColor;
<mask> const textAlign = context.textAlign;
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove const direction = isRTL(element.text) ? "rtl" : "ltr";
</s> add </s> remove element.textAlign === "center" ? element.width / 2 : element.width;
</s> add element.textAlign === "center"
? element.width / 2
: element.textAlign === "right"
? element.width
: 0; </s> remove horizontalOffset,
</s> add 0 + horizontalOffset, </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> : 0;
<mask> for (let i = 0; i < lines.length; i++) {
<mask> context.fillText(
<mask> lines[i],
<mask> horizontalOffset,
<mask> (i + 1) * lineHeight - verticalOffset,
<mask> );
<mask> }
<mask> context.fillStyle = fillStyle;
<mask> context.font = font;
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove const direction = isRTL(element.text) ? "rtl" : "ltr";
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> remove element.textAlign === "center" ? element.width / 2 : element.width;
</s> add element.textAlign === "center"
? element.width / 2
: element.textAlign === "right"
? element.width
: 0; </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> );
<mask> context.rotate(-element.angle);
<mask> context.translate(-cx, -cy);
<mask> context.scale(window.devicePixelRatio, window.devicePixelRatio);
<mask>
<mask> // Clear the nested element we appended to the DOM
<mask> const node = document.querySelector("#nested-canvas-element");
<mask> if (node && node.parentNode) {
<mask> node.parentNode.removeChild(node);
<mask> }
<mask> };
<mask>
<mask> export const renderElement = (
<mask> element: NonDeletedExcalidrawElement,
<mask> rc: RoughCanvas,
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep add keep keep keep keep keep keep
|
<mask> case "draw":
<mask> case "arrow":
<mask> case "text": {
<mask> if (renderOptimizations) {
<mask> drawElementFromCanvas(elementWithCanvas, rc, context, sceneState);
<mask> } else {
<mask> const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
<mask> const cx = (x1 + x2) / 2 + sceneState.scrollX;
<mask> const cy = (y1 + y2) / 2 + sceneState.scrollY;
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> remove element.textAlign === "center" ? element.width / 2 : element.width;
</s> add element.textAlign === "center"
? element.width / 2
: element.textAlign === "right"
? element.width
: 0; </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> remove const direction = isRTL(element.text) ? "rtl" : "ltr";
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> case "draw":
<mask> case "arrow":
<mask> case "text": {
<mask> if (renderOptimizations) {
<mask> const elementWithCanvas = generateElement(
<mask> element,
<mask> generator,
<mask> sceneState,
<mask> );
<mask> drawElementFromCanvas(elementWithCanvas, rc, context, sceneState);
<mask> } else {
<mask> const [x1, y1, x2, y2] = getElementAbsoluteCoords(element);
<mask> const cx = (x1 + x2) / 2 + sceneState.scrollX;
<mask> const cy = (y1 + y2) / 2 + sceneState.scrollY;
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> remove element.textAlign === "center" ? element.width / 2 : element.width;
</s> add element.textAlign === "center"
? element.width / 2
: element.textAlign === "right"
? element.width
: 0; </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> remove horizontalOffset,
</s> add 0 + horizontalOffset,
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const lines = element.text.replace(/\r\n?/g, "\n").split("\n");
<mask> const lineHeight = element.height / lines.length;
<mask> const verticalOffset = element.height - element.baseline;
<mask> const horizontalOffset =
<mask> element.textAlign === "center" ? element.width / 2 : element.width;
<mask> const textAnchor =
<mask> element.textAlign === "center"
<mask> ? "middle"
<mask> : element.textAlign === "right"
<mask> ? "end"
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove const direction = isRTL(element.text) ? "rtl" : "ltr";
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> add document.body.appendChild(tempCanvas); </s> remove horizontalOffset,
</s> add 0 + horizontalOffset,
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> ? "middle"
<mask> : element.textAlign === "right"
<mask> ? "end"
<mask> : "start";
<mask> const direction = isRTL(element.text) ? "rtl" : "ltr";
<mask> for (let i = 0; i < lines.length; i++) {
<mask> const text = svgRoot.ownerDocument!.createElementNS(SVG_NS, "text");
<mask> text.textContent = lines[i];
<mask> text.setAttribute("x", `${horizontalOffset}`);
<mask> text.setAttribute("y", `${(i + 1) * lineHeight - verticalOffset}`);
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove element.textAlign === "center" ? element.width / 2 : element.width;
</s> add element.textAlign === "center"
? element.width / 2
: element.textAlign === "right"
? element.width
: 0; </s> remove horizontalOffset,
</s> add 0 + horizontalOffset, </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> text.setAttribute("font-size", `${element.fontSize}px`);
<mask> text.setAttribute("fill", element.strokeColor);
<mask> text.setAttribute("text-anchor", textAnchor);
<mask> text.setAttribute("style", "white-space: pre;");
<mask> text.setAttribute("direction", direction);
<mask> node.appendChild(text);
<mask> }
<mask> svgRoot.appendChild(node);
<mask> } else {
<mask> // @ts-ignore
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove import {
SVG_NS,
distance,
getFontString,
getFontFamilyString,
isRTL,
} from "../utils";
</s> add import { SVG_NS, distance, getFontString, getFontFamilyString } from "../utils"; </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove
// Clear the nested element we appended to the DOM
const node = document.querySelector("#nested-canvas-element");
if (node && node.parentNode) {
node.parentNode.removeChild(node);
}
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add </s> remove horizontalOffset,
</s> add 0 + horizontalOffset,
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/renderer/renderElement.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> createCanvas: (width: number, height: number) => any = (width, height) => {
<mask> const tempCanvas = document.createElement("canvas");
<mask> tempCanvas.width = width * scale;
<mask> tempCanvas.height = height * scale;
<mask> // We append the canvas before drawing it to it for RTL to work
<mask> document.body.appendChild(tempCanvas);
<mask> return tempCanvas;
<mask> },
<mask> ) => {
<mask> let sceneElements = elements;
<mask> if (shouldAddWatermark) {
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> add document.body.appendChild(tempCanvas); </s> remove
export const isRTL = (text: string) => {
const ltrChars =
"A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
"\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
return rtlDirCheck.test(text);
};
</s> add </s> remove
// Clear the nested element we appended to the DOM
const node = document.querySelector("#nested-canvas-element");
if (node && node.parentNode) {
node.parentNode.removeChild(node);
}
</s> add </s> remove const direction = isRTL(element.text) ? "rtl" : "ltr";
</s> add </s> remove horizontalOffset,
</s> add 0 + horizontalOffset,
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/scene/export.ts
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace
|
<mask> };
<mask>
<mask> export const getGlobalCSSVariable = (name: string) =>
<mask> getComputedStyle(document.documentElement).getPropertyValue(`--${name}`);
<mask>
<mask> export const isRTL = (text: string) => {
<mask> const ltrChars =
<mask> "A-Za-z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02B8\u0300-\u0590\u0800-\u1FFF" +
<mask> "\u2C00-\uFB1C\uFDFE-\uFE6F\uFEFD-\uFFFF";
<mask> const rtlChars = "\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC";
<mask> const rtlDirCheck = new RegExp(`^[^${ltrChars}]*[${rtlChars}]`);
<mask>
<mask> return rtlDirCheck.test(text);
<mask> };
</s> Revert "Fix RTL text direction rendering (#1687)" (#1705)
This reverts commit a118bed82f898a365cf5f71ed32f69f51fd08a47. </s> remove
// Clear the nested element we appended to the DOM
const node = document.querySelector("#nested-canvas-element");
if (node && node.parentNode) {
node.parentNode.removeChild(node);
}
</s> add </s> remove // We append the canvas before drawing it to it for RTL to work
document.body.appendChild(tempCanvas);
</s> add </s> remove // To be able to draw a nested element with RTL, we have to append it to the DOM
canvas.style.display = "none";
canvas.id = "nested-canvas-element";
document.body.appendChild(canvas);
</s> add </s> add const elementWithCanvas = generateElement(element, generator, sceneState);
</s> remove const elementWithCanvas = generateElement(
element,
generator,
sceneState,
);
</s> add </s> remove context.canvas.setAttribute("dir", isRTL(element.text) ? "rtl" : "ltr");
</s> add
|
https://github.com/excalidraw/excalidraw/commit/ff93d95998713985cfa0dc8acbffbbbf0dea9984
|
src/utils.ts
|
keep add keep keep keep keep
|
<mask> ExcalidrawElement,
<mask> ExcalidrawSelectionElement,
<mask> FontFamilyValues,
<mask> } from "../element/types";
<mask> import {
<mask> AppState,
</s> fix: repair element bindings on restore (#5956)
* fix: repair element bindings on restore
* fix dropping non-text bound elements
* be more conservative </s> remove import { isLinearElementType } from "../element/typeChecks";
</s> add import { isLinearElementType, isTextElement } from "../element/typeChecks"; </s> add // repair binding. Mutates elements.
const restoredElementsMap = arrayToMap(restoredElements);
for (const element of restoredElements) {
if (isTextElement(element) && element.containerId) {
repairBoundElement(element, restoredElementsMap);
} else if (element.boundElements) {
repairContainerElement(element, restoredElementsMap);
}
}
return restoredElements; </s> remove return (elements || []).reduce((elements, element) => {
</s> add const restoredElements = (elements || []).reduce((elements, element) => {
|
https://github.com/excalidraw/excalidraw/commit/fffd4957db0f9c1968cef5120df83c952e002568
|
src/data/restore.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> getNormalizedDimensions,
<mask> isInvisiblySmallElement,
<mask> refreshTextDimensions,
<mask> } from "../element";
<mask> import { isLinearElementType } from "../element/typeChecks";
<mask> import { randomId } from "../random";
<mask> import {
<mask> DEFAULT_FONT_FAMILY,
<mask> DEFAULT_TEXT_ALIGN,
<mask> DEFAULT_VERTICAL_ALIGN,
</s> fix: repair element bindings on restore (#5956)
* fix: repair element bindings on restore
* fix dropping non-text bound elements
* be more conservative </s> add // repair binding. Mutates elements.
const restoredElementsMap = arrayToMap(restoredElements);
for (const element of restoredElements) {
if (isTextElement(element) && element.containerId) {
repairBoundElement(element, restoredElementsMap);
} else if (element.boundElements) {
repairContainerElement(element, restoredElementsMap);
}
}
return restoredElements; </s> add ExcalidrawTextElement, </s> remove return (elements || []).reduce((elements, element) => {
</s> add const restoredElements = (elements || []).reduce((elements, element) => {
|
https://github.com/excalidraw/excalidraw/commit/fffd4957db0f9c1968cef5120df83c952e002568
|
src/data/restore.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> localElements: readonly ExcalidrawElement[] | null | undefined,
<mask> refreshDimensions = false,
<mask> ): ExcalidrawElement[] => {
<mask> const localElementsMap = localElements ? arrayToMap(localElements) : null;
<mask> return (elements || []).reduce((elements, element) => {
<mask> // filtering out selection, which is legacy, no longer kept in elements,
<mask> // and causing issues if retained
<mask> if (element.type !== "selection" && !isInvisiblySmallElement(element)) {
<mask> let migratedElement: ExcalidrawElement | null = restoreElement(
<mask> element,
</s> fix: repair element bindings on restore (#5956)
* fix: repair element bindings on restore
* fix dropping non-text bound elements
* be more conservative </s> remove import { isLinearElementType } from "../element/typeChecks";
</s> add import { isLinearElementType, isTextElement } from "../element/typeChecks"; </s> add // repair binding. Mutates elements.
const restoredElementsMap = arrayToMap(restoredElements);
for (const element of restoredElements) {
if (isTextElement(element) && element.containerId) {
repairBoundElement(element, restoredElementsMap);
} else if (element.boundElements) {
repairContainerElement(element, restoredElementsMap);
}
}
return restoredElements; </s> add ExcalidrawTextElement,
|
https://github.com/excalidraw/excalidraw/commit/fffd4957db0f9c1968cef5120df83c952e002568
|
src/data/restore.ts
|
keep keep keep add keep keep keep keep keep
|
<mask> }
<mask> }
<mask> return elements;
<mask> }, [] as ExcalidrawElement[]);
<mask> };
<mask>
<mask> const coalesceAppStateValue = <
<mask> T extends keyof ReturnType<typeof getDefaultAppState>,
<mask> >(
</s> fix: repair element bindings on restore (#5956)
* fix: repair element bindings on restore
* fix dropping non-text bound elements
* be more conservative </s> remove import { isLinearElementType } from "../element/typeChecks";
</s> add import { isLinearElementType, isTextElement } from "../element/typeChecks"; </s> add ExcalidrawTextElement, </s> remove return (elements || []).reduce((elements, element) => {
</s> add const restoredElements = (elements || []).reduce((elements, element) => {
|
https://github.com/excalidraw/excalidraw/commit/fffd4957db0f9c1968cef5120df83c952e002568
|
src/data/restore.ts
|
keep keep replace keep replace replace replace
|
<mask> ```
<mask>
<mask> You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`.
<mask>
<mask> Create a new file called **withAndroidVerifiedLinksWorkaround.js** in your project with the following code snippet:
<mask>
<mask> ```javascript
</s> [docs] Update Deep Linking guide (#20526) </s> remove An example of this is Gmail which strips the href property from links of most apps, a trick to use is to link to a regular https url instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the href property so you can host a file online that redirects the user to your app's custom schemes.
</s> add An example of this is Gmail which strips the `href` property from the links of most apps, a trick to use is to link to a regular HTTPS URL instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the `href` property so you can host a file online that redirects the user to your app's custom schemes. </s> remove ## When to _not_ use deep links
</s> add </Collapsible>
## When to not use deep links </s> remove This is the easiest way to set up deep links into your app because it requires a minimal amount of configuration.
</s> add This is the easiest way to set up deep links in your app because it requires a minimal amount of configuration. </s> remove ```javascript
</s> add ```js </s> remove Next, in you **app.json**, add this plugin under `expo.plugins`:
</s> add Next, in your **app.json**, add the path to the plugin under `expo.plugins`:
|
https://github.com/expo/expo/commit/00a30a4d8297d571cb9f3977f601c04e00ad2075
|
docs/pages/guides/deep-linking.mdx
|
keep replace keep replace
|
<mask>
<mask> Next, in you **app.json**, add this plugin under `expo.plugins`:
<mask>
<mask> ```json
</s> [docs] Update Deep Linking guide (#20526) </s> remove An example of this is Gmail which strips the href property from links of most apps, a trick to use is to link to a regular https url instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the href property so you can host a file online that redirects the user to your app's custom schemes.
</s> add An example of this is Gmail which strips the `href` property from the links of most apps, a trick to use is to link to a regular HTTPS URL instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the `href` property so you can host a file online that redirects the user to your app's custom schemes. </s> remove ## When to _not_ use deep links
</s> add </Collapsible>
## When to not use deep links </s> remove This is the easiest way to set up deep links into your app because it requires a minimal amount of configuration.
</s> add This is the easiest way to set up deep links in your app because it requires a minimal amount of configuration. </s> remove ```javascript
</s> add ```js </s> remove You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`.
</s> add You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`. In your project, create a new file called **withAndroidVerifiedLinksWorkaround.js** with the following code snippet:
|
https://github.com/expo/expo/commit/00a30a4d8297d571cb9f3977f601c04e00ad2075
|
docs/pages/guides/deep-linking.mdx
|
keep keep keep replace keep replace keep keep keep
|
<mask>
<mask> If you are using [EAS Build](/build/introduction/), you will have to create a new build after adding these changes to your project so that they are reflected in your Android app.
<mask>
<mask> ## When to _not_ use deep links
<mask>
<mask> This is the easiest way to set up deep links into your app because it requires a minimal amount of configuration.
<mask>
<mask> The main problem is that if the user does not have your app installed and follows a link to your app with its custom scheme, their operating system will indicate that the page couldn't be opened but not give much more information. This is not a great experience. There is no way to work around this in the browser.
<mask>
</s> [docs] Update Deep Linking guide (#20526) </s> remove An example of this is Gmail which strips the href property from links of most apps, a trick to use is to link to a regular https url instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the href property so you can host a file online that redirects the user to your app's custom schemes.
</s> add An example of this is Gmail which strips the `href` property from the links of most apps, a trick to use is to link to a regular HTTPS URL instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the `href` property so you can host a file online that redirects the user to your app's custom schemes. </s> remove ```javascript
</s> add ```js </s> remove You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`.
</s> add You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`. In your project, create a new file called **withAndroidVerifiedLinksWorkaround.js** with the following code snippet: </s> remove Next, in you **app.json**, add this plugin under `expo.plugins`:
</s> add Next, in your **app.json**, add the path to the plugin under `expo.plugins`: </s> remove Create a new file called **withAndroidVerifiedLinksWorkaround.js** in your project with the following code snippet:
```javascript
</s> add ```js withAndroidVerifiedLinksWorkaround.js
|
https://github.com/expo/expo/commit/00a30a4d8297d571cb9f3977f601c04e00ad2075
|
docs/pages/guides/deep-linking.mdx
|
keep keep keep replace keep keep keep replace keep
|
<mask>
<mask> Additionally, many messaging apps do not autolink URLs with custom schemes -- for example, `exp://u.expo.dev/[project-id]?channel-name=[channel-name]&runtime-version=[runtime-version]` might just show up as plain text in your browser rather than as a link ([exp://u.expo.dev/[project-id]?channel-name=[channel-name]&runtime-version=[runtime-version]](#)).
<mask>
<mask> An example of this is Gmail which strips the href property from links of most apps, a trick to use is to link to a regular https url instead of your app's custom scheme, this will open the user's web browser. Browsers do not usually strip the href property so you can host a file online that redirects the user to your app's custom schemes.
<mask>
<mask> Instead of linking to `example://path/into/app`, you could link to `https://example.com/redirect-to-app.html` and `redirect-to-app.html` would contain the following code:
<mask>
<mask> ```javascript
<mask> <script>window.location.replace("example://path/into/app");</script>
</s> [docs] Update Deep Linking guide (#20526) </s> remove This is the easiest way to set up deep links into your app because it requires a minimal amount of configuration.
</s> add This is the easiest way to set up deep links in your app because it requires a minimal amount of configuration. </s> remove ## When to _not_ use deep links
</s> add </Collapsible>
## When to not use deep links </s> remove You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`.
</s> add You can fix this issue by creating a custom [Config Plugin](/guides/config-plugins/) that removes the `exp+` schemes when verifying `intentFilters`. In your project, create a new file called **withAndroidVerifiedLinksWorkaround.js** with the following code snippet: </s> remove Next, in you **app.json**, add this plugin under `expo.plugins`:
</s> add Next, in your **app.json**, add the path to the plugin under `expo.plugins`: </s> remove Create a new file called **withAndroidVerifiedLinksWorkaround.js** in your project with the following code snippet:
```javascript
</s> add ```js withAndroidVerifiedLinksWorkaround.js
|
https://github.com/expo/expo/commit/00a30a4d8297d571cb9f3977f601c04e00ad2075
|
docs/pages/guides/deep-linking.mdx
|
keep keep keep keep replace keep keep keep
|
<mask> override fun handles(model: String): Boolean {
<mask> return model.startsWith("data:")
<mask> }
<mask>
<mask> override fun buildLoadData(model: String, width: Int, height: Int, options: Options): ModelLoader.LoadData<ByteBuffer> {
<mask> return ModelLoader.LoadData(ObjectKey(model), Base64DataFetcher(model))
<mask> }
<mask> }
</s> [image][Android] Add support for the BlurHash (#20463)
# Why
Adds support for the BlurHash algorithm.
# How
Adds custom model to handle blur hash URIs (blurhash:<hash>/width/height/punch). It's similar to the one that loads data URLs.
> Note: this PR only contains the Android implementation, the js part will be done in a separate one.
# Test Plan
- manually added a blur hash in the native code. I'll test it using js before merging. </s> add private fun isBlurhash() = parsedUri?.scheme?.startsWith("blurhash") ?: false
</s> remove if (isContentUrl() || isDataUrl()) {
</s> add if (isContentUrl() || isDataUrl() || isBlurhash()) {
|
https://github.com/expo/expo/commit/0568251c17ca652361aaa497045ae66e4423e3dd
|
packages/expo-image/android/src/main/java/expo/modules/image/dataurls/Base64ModelLoader.kt
|
keep add keep keep keep keep
|
<mask> private fun isLocalFileUri() = parsedUri?.scheme?.startsWith("file") ?: false
<mask>
<mask> internal fun createGlideModel(context: Context): GlideModel? {
<mask> if (uri == null) {
<mask> return null
<mask> }
</s> [image][Android] Add support for the BlurHash (#20463)
# Why
Adds support for the BlurHash algorithm.
# How
Adds custom model to handle blur hash URIs (blurhash:<hash>/width/height/punch). It's similar to the one that loads data URLs.
> Note: this PR only contains the Android implementation, the js part will be done in a separate one.
# Test Plan
- manually added a blur hash in the native code. I'll test it using js before merging. </s> remove if (isContentUrl() || isDataUrl()) {
</s> add if (isContentUrl() || isDataUrl() || isBlurhash()) { </s> remove override fun buildLoadData(model: String, width: Int, height: Int, options: Options): ModelLoader.LoadData<ByteBuffer> {
</s> add override fun buildLoadData(
model: String,
width: Int,
height: Int,
options: Options
): ModelLoader.LoadData<ByteBuffer> {
|
https://github.com/expo/expo/commit/0568251c17ca652361aaa497045ae66e4423e3dd
|
packages/expo-image/android/src/main/java/expo/modules/image/records/SourceMap.kt
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (parsedUri == null) {
<mask> parsedUri = computeUri(context)
<mask> }
<mask>
<mask> if (isContentUrl() || isDataUrl()) {
<mask> return GlideRawModel(uri)
<mask> }
<mask>
<mask> if (isResourceUri()) {
<mask> return GlideUriModel(parsedUri!!)
</s> [image][Android] Add support for the BlurHash (#20463)
# Why
Adds support for the BlurHash algorithm.
# How
Adds custom model to handle blur hash URIs (blurhash:<hash>/width/height/punch). It's similar to the one that loads data URLs.
> Note: this PR only contains the Android implementation, the js part will be done in a separate one.
# Test Plan
- manually added a blur hash in the native code. I'll test it using js before merging. </s> add private fun isBlurhash() = parsedUri?.scheme?.startsWith("blurhash") ?: false
</s> remove override fun buildLoadData(model: String, width: Int, height: Int, options: Options): ModelLoader.LoadData<ByteBuffer> {
</s> add override fun buildLoadData(
model: String,
width: Int,
height: Int,
options: Options
): ModelLoader.LoadData<ByteBuffer> {
|
https://github.com/expo/expo/commit/0568251c17ca652361aaa497045ae66e4423e3dd
|
packages/expo-image/android/src/main/java/expo/modules/image/records/SourceMap.kt
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if (isNewArchitectureEnabled()) {
<mask> var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')}
<mask> externalNativeBuild {
<mask> cmake {
<mask> cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17"
<mask> arguments "-DAPP_BUILD_DIR=${appProject.buildDir}",
<mask> "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
<mask> "-DANDROID_STL=c++_shared"
<mask> abiFilters (*reactNativeArchitectures())
<mask> }
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0" </s> remove "version": "2.10.1",
</s> add "version": "2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0",
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
android/vendored/unversioned/react-native-gesture-handler/android/build.gradle
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "native-component-list": "*",
<mask> "react": "18.2.0",
<mask> "react-dom": "18.2.0",
<mask> "react-native": "0.72.0-rc.6",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "react-native-pager-view": "6.2.0",
<mask> "react-native-reanimated": "~3.1.0",
<mask> "react-native-safe-area-context": "4.5.0",
<mask> "react-native-screens": "~3.20.0",
<mask> "react-native-shared-element": "0.8.8",
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0"
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
apps/bare-expo/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "react": "18.2.0",
<mask> "react-dom": "18.2.0",
<mask> "react-native": "0.72.0-rc.6",
<mask> "react-native-dropdown-picker": "^5.3.0",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "react-native-maps": "1.7.1",
<mask> "react-native-pager-view": "6.2.0",
<mask> "react-native-paper": "^4.0.1",
<mask> "react-native-reanimated": "~3.1.0",
<mask> "react-native-safe-area-context": "4.5.0",
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0"
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
apps/native-component-list/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "jasmine-core": "^2.4.1",
<mask> "lodash": "^4.17.19",
<mask> "react": "18.2.0",
<mask> "react-native": "0.72.0-rc.6",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "sinon": "^7.1.1"
<mask> },
<mask> "devDependencies": {
<mask> "expo-yarn-workspaces": "^2.0.0"
<mask> },
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0" </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0",
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
apps/test-suite/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "querystring": "^0.2.0",
<mask> "react": "18.2.0",
<mask> "react-native": "0.72.0-rc.6",
<mask> "react-native-fade-in-image": "^1.6.1",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "react-native-infinite-scroll-view": "^0.4.5",
<mask> "react-native-keyboard-aware-scroll-view": "^0.9.5",
<mask> "react-native-maps": "1.7.1",
<mask> "react-native-paper": "^4.0.1",
<mask> "react-native-reanimated": "~3.1.0",
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0"
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
home/package.json
|
keep keep replace keep keep keep keep keep
|
<mask> {
<mask> "name": "RNGestureHandler",
<mask> "version": "2.10.1",
<mask> "summary": "Experimental implementation of a new declarative API for gesture handling in react-native",
<mask> "homepage": "https://github.com/software-mansion/react-native-gesture-handler",
<mask> "license": "MIT",
<mask> "authors": {
<mask> "Krzysztof Magiera": "[email protected]"
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0" </s> remove cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17"
</s> add cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17", "-DANDROID" </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0",
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "Krzysztof Magiera": "[email protected]"
<mask> },
<mask> "source": {
<mask> "git": "https://github.com/software-mansion/react-native-gesture-handler",
<mask> "tag": "2.10.1"
<mask> },
<mask> "source_files": "ios/**/*.{h,m,mm}",
<mask> "requires_arc": true,
<mask> "platforms": {
<mask> "ios": "9.0",
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "version": "2.10.1",
</s> add "version": "2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17"
</s> add cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17", "-DANDROID" </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0",
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
ios/vendored/unversioned/react-native-gesture-handler/RNGestureHandler.podspec.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "commander": "^8.0.0",
<mask> "esbuild": "^0.12.15",
<mask> "fs-extra": "^9.1.0",
<mask> "glob": "^7.1.7",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "react-native-safe-area-context": "4.5.0",
<mask> "react-native-screens": "~3.20.0",
<mask> "react-native-svg": "13.9.0",
<mask> "sane": "^5.0.1"
<mask> }
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17"
</s> add cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17", "-DANDROID" </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0",
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
packages/expo-stories/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "react-dom": "18.2.0",
<mask> "react-native": "0.72.0-rc.6",
<mask> "react-native-web": "~0.18.10",
<mask> "react-native-branch": "^5.4.0",
<mask> "react-native-gesture-handler": "~2.10.1",
<mask> "react-native-get-random-values": "~1.8.0",
<mask> "react-native-maps": "1.7.1",
<mask> "react-native-pager-view": "6.2.0",
<mask> "react-native-reanimated": "~3.1.0",
<mask> "react-native-screens": "~3.20.0",
</s> Update vendored gesture handler to 2.12.0 (#22906) </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "react-native-gesture-handler": "~2.10.1",
</s> add "react-native-gesture-handler": "~2.12.0", </s> remove "tag": "2.10.1"
</s> add "tag": "2.12.0"
|
https://github.com/expo/expo/commit/057765b55022c8c54718a2f56a8a3ae657d1fed7
|
packages/expo/bundledNativeModules.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "jest": {
<mask> "preset": "expo-module-scripts/ios"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18"
<mask> },
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "unimodulePeerDependencies": {
"@unimodules/core": "*",
"unimodules-permissions-interface": "*"
},
</s> add </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "^3.4.0"
</s> add "uuid": "^3.4.0",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-ads-admob/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "homepage": "https://docs.expo.io/versions/latest/sdk/facebook-ads/",
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18",
<mask> "fbemitter": "^2.1.1",
<mask> "nullthrows": "^1.1.0"
<mask> },
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "nullthrows": "^1.1.0"
</s> add "nullthrows": "^1.1.0",
"unimodules-permissions-interface": "~6.1.0"
</s> remove "unimodulePeerDependencies": {
"@unimodules/core": "*",
"unimodules-permissions-interface": "*"
},
</s> add </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-ads-facebook/package.json
|
keep keep keep keep replace keep keep
|
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18",
<mask> "lodash": "^4.17.15",
<mask> "nullthrows": "^1.1.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "nullthrows": "^1.1.0"
</s> add "nullthrows": "^1.1.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-av/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "jest": {
<mask> "preset": "expo-module-scripts/ios"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18"
<mask> },
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-barcode-scanner/package.json
|
keep keep keep keep replace keep keep
|
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.22"
</s> add "@expo/config-plugins": "^1.0.22",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "7.0.2"
</s> add "uuid": "7.0.2",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-brightness/package.json
|
keep keep keep keep replace keep keep
|
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-calendar/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "preset": "expo-module-scripts"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18",
<mask> "uuid": "^3.4.0"
<mask> },
<mask> "devDependencies": {
<mask> "@types/uuid": "^3.4.7",
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "uuid": "^3.4.0"
</s> add "uuid": "^3.4.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "7.0.2"
</s> add "uuid": "7.0.2",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-contacts/package.json
|
keep keep keep keep replace keep keep
|
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.22"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "7.0.2"
</s> add "uuid": "7.0.2",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-facebook/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18",
<mask> "expo-permissions": "~12.0.0",
<mask> "uuid": "7.0.2"
<mask> },
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "uuid": "^3.4.0"
</s> add "uuid": "^3.4.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-image-picker/package.json
|
keep keep keep keep replace keep keep
|
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> },
<mask> "dependencies": {
<mask> "@expo/config-plugins": "^1.0.18"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-media-library/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "assert": "^2.0.0",
<mask> "badgin": "^1.1.5",
<mask> "expo-application": "~3.1.0",
<mask> "expo-constants": "10.1.1",
<mask> "uuid": "^3.4.0"
<mask> },
<mask> "devDependencies": {
<mask> "@types/fs-extra": "^9.0.6",
<mask> "@types/node-fetch": "^2.5.7",
<mask> "@types/uuid": "^3.4.7",
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "uuid": "^3.4.0"
</s> add "uuid": "^3.4.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "7.0.2"
</s> add "uuid": "7.0.2",
"unimodules-permissions-interface": "~6.1.0" </s> remove "unimodulePeerDependencies": {
"@unimodules/core": "*",
"unimodules-permissions-interface": "*"
},
</s> add </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-notifications/package.json
|
keep keep keep keep replace replace replace replace keep keep keep keep
|
<mask> "homepage": "https://docs.expo.io/versions/latest/sdk/sms/",
<mask> "jest": {
<mask> "preset": "expo-module-scripts/ios"
<mask> },
<mask> "unimodulePeerDependencies": {
<mask> "@unimodules/core": "*",
<mask> "unimodules-permissions-interface": "*"
<mask> },
<mask> "devDependencies": {
<mask> "expo-module-scripts": "^2.0.0"
<mask> }
<mask> }
</s> [permissions] Add missing permissions interface dependency. Fixes #12361 </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "nullthrows": "^1.1.0"
</s> add "nullthrows": "^1.1.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "uuid": "^3.4.0"
</s> add "uuid": "^3.4.0",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.18"
</s> add "@expo/config-plugins": "^1.0.18",
"unimodules-permissions-interface": "~6.1.0" </s> remove "@expo/config-plugins": "^1.0.22"
</s> add "@expo/config-plugins": "^1.0.22",
"unimodules-permissions-interface": "~6.1.0"
|
https://github.com/expo/expo/commit/07095d76c5e5f941e20b2f9902bbade7ca27d0c4
|
packages/expo-sms/package.json
|
keep keep keep keep replace keep keep
|
<mask> "@types/semver": "^7.3.5",
<mask> "babel-preset-expo": "^8.1.0",
<mask> "expo-module-scripts": "^1.2.0",
<mask> "prettier": "^2.0.4",
<mask> "typescript": "^4.0.2"
<mask> }
<mask> }
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { promisify } from 'util';
</s> add </s> remove await fsWriteFileAsync(excludeFile, gitCommandOutput);
</s> add await fse.writeFile(excludeFile, gitCommandOutput); </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously.
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/package.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return this.blockquote(token, ctx);
<mask> default:
<mask> // `marked` provides much more tokens, however we don't need to go so deep.
<mask> // So far we needed only tokens with above types.
<mask> throw new Error(`Cannot parse token with type: ${token!.type}`);
<mask> }
<mask> }
<mask>
<mask> indent(depth?: number, indentStr: string = ' '): string {
<mask> return depth ? indentStr.repeat(depth) : '';
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove import { promisify } from 'util';
</s> add </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait';
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/Markdown.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import { SpawnOptions } from 'child_process';
<mask> import fse from 'fs-extra';
<mask> import os from 'os';
<mask> import path from 'path';
<mask> import { promisify } from 'util';
<mask> import spawnAsync from '@expo/spawn-async';
<mask>
<mask> export const S3_BUCKET = 'exp-artifacts';
<mask> export const S3_URL = `s3://${S3_BUCKET}`;
<mask> export const S3_WEBSITE_PATH = `build-artifacts.exp.host`;
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => {
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/S3.ts
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> export const S3_BUCKET = 'exp-artifacts';
<mask> export const S3_URL = `s3://${S3_BUCKET}`;
<mask> export const S3_WEBSITE_PATH = `build-artifacts.exp.host`;
<mask>
<mask> const fsWriteFileAsync = promisify(fse.writeFile);
<mask>
<mask> export async function addRedirectAsync(from: string, to: string): Promise<void> {
<mask> from = from.replace(new RegExp(`^s3:\/\/${S3_BUCKET}\/?`), '');
<mask>
<mask> let s3 = await _s3ClientAsync();
<mask> await s3
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove import { promisify } from 'util';
</s> add </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove await fsWriteFileAsync(excludeFile, gitCommandOutput);
</s> add await fse.writeFile(excludeFile, gitCommandOutput); </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`);
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/S3.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> cwd: directory.source,
<mask> }
<mask> );
<mask> let gitCommandOutput = gitCommand.stdout.toString();
<mask> await fsWriteFileAsync(excludeFile, gitCommandOutput);
<mask> await spawnAsync(
<mask> 'rsync',
<mask> [
<mask> '-azP',
<mask> '--exclude=.git',
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove import { promisify } from 'util';
</s> add </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously.
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/S3.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> export async function retryAsync<T = any>(
<mask> interval: number,
<mask> limit: number,
<mask> callback: () => T | Promise<T>
<mask> ): Promise<T> {
<mask> return new Promise((resolve) => {
<mask> let count = 0;
<mask>
<mask> const timeoutCallback = async () => {
<mask> const result = await callback();
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove import { promisify } from 'util';
</s> add </s> remove await fsWriteFileAsync(excludeFile, gitCommandOutput);
</s> add await fse.writeFile(excludeFile, gitCommandOutput);
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/Utils.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> /**
<mask> * A function which will be call in start method. The body of the task.
<mask> */
<mask> protected abstract async execute();
<mask>
<mask> /**
<mask> * A method that starts the task. It provides error handling.
<mask> */
<mask> public async start() {
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait';
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/vendoring/devmenu/steps/Task.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> const dirs = ['Common', 'cpp'];
<mask> for (let dir of dirs) {
<mask> await fs.remove(path.join(androidMainPathExpoview, dir)); // clean
<mask> // copy
<mask> await new Promise((res, rej) => {
<mask> ncp(
<mask> path.join(androidMainPathReanimated, dir),
<mask> path.join(androidMainPathExpoview, dir),
<mask> { dereference: true },
<mask> () => {
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
</s> add const taskQueue = new TaskQueue(Promise as PromisyClass, 4); // Transform up to 4 files simultaneously. </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove import { promisify } from 'util';
</s> add </s> remove protected abstract async execute();
</s> add protected abstract execute(): Promise<void>;
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/vendoring/legacy.ts
|
keep keep replace keep keep keep keep keep
|
<mask> import spawnAsync from '@expo/spawn-async';
<mask> import chalk from 'chalk';
<mask> import { TaskQueue } from 'cwait';
<mask> import fs from 'fs-extra';
<mask> import glob from 'glob-promise';
<mask> import inquirer from 'inquirer';
<mask> import path from 'path';
<mask> import semver from 'semver';
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { promisify } from 'util';
</s> add </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove "typescript": "^4.0.2"
</s> add "typescript": "~4.3.5"
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/versioning/ios/index.ts
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> */
<mask> async function namespaceReactNativeFilesAsync(filenames, versionPrefix, versionedPodNames) {
<mask> const reactPodName = versionedPodNames.React;
<mask> const transformRules = _getReactNativeTransformRules(versionPrefix, reactPodName);
<mask> const taskQueue = new TaskQueue(Promise, 4); // Transform up to 4 files simultaneously.
<mask> const transformRulesCache = {};
<mask>
<mask> const transformSingleFile = taskQueue.wrap(async (filename) => {
<mask> if (_isDirectory(filename)) {
<mask> return;
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove ): Promise<T> {
</s> add ): Promise<T | undefined> { </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove import { promisify } from 'util';
</s> add </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove protected abstract async execute();
</s> add protected abstract execute(): Promise<void>;
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/versioning/ios/index.ts
|
keep replace keep keep keep keep keep
|
<mask> import chalk from 'chalk';
<mask> import { TaskQueue } from 'cwait';
<mask> import fs from 'fs-extra';
<mask> import os from 'os';
<mask> import path from 'path';
<mask>
<mask> import logger from '../../Logger';
</s> [expotools] upgrade typescript to v4.3.5 (#14102) </s> remove import { TaskQueue } from 'cwait';
</s> add import { PromisyClass, TaskQueue } from 'cwait'; </s> remove import { promisify } from 'util';
</s> add </s> remove const fsWriteFileAsync = promisify(fse.writeFile);
</s> add </s> remove throw new Error(`Cannot parse token with type: ${token!.type}`);
</s> add throw new Error(`Cannot parse token: ${token}`); </s> remove await new Promise((res, rej) => {
</s> add await new Promise<void>((res, rej) => { </s> remove "typescript": "^4.0.2"
</s> add "typescript": "~4.3.5"
|
https://github.com/expo/expo/commit/086befdac799b13eb7a9c3ada3c12278cf0f5dd5
|
tools/src/versioning/ios/versionExpoModules.ts
|
keep keep keep add keep keep keep keep keep keep
|
<mask> }
<mask> compile ('com.facebook.android:facebook-android-sdk:4.7.0') {
<mask> exclude module: 'bolts-android'
<mask> }
<mask> provided 'org.glassfish:javax.annotation:3.1.1'
<mask> compile 'de.greenrobot:eventbus:2.4.0'
<mask> compile 'com.amplitude:android-sdk:2.9.2' // Be careful when upgrading! Upgrading might break experience scoping. Check with Jesse. See Analytics.resetAmplitudeDatabaseHelper
<mask> compile 'com.squareup.picasso:picasso:2.5.2'
<mask> compile 'com.google.android.gms:play-services-gcm:9.8.0'
<mask> compile 'com.google.android.gms:play-services-analytics:9.8.0'
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> remove } catch (JSONException e) {
EXL.e(TAG, e.toString());
} catch (UnsupportedEncodingException e) {
</s> add nativeModules.add(new NativeAdManager(reactContext));
nativeModules.add(new AdSettingsManager(reactContext));
nativeModules.add(new InterstitialAdManager(reactContext));
} catch (JSONException | UnsupportedEncodingException e) { </s> remove new GLViewManager()
</s> add new GLViewManager(),
new NativeAdViewManager(reactContext),
new BannerViewManager(reactContext) </s> add { "name": "FBAudienceNetwork", "version": "4.18" }, </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add <activity
android:name="com.facebook.ads.InterstitialAdActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
android/exponentview/build.gradle
|
keep keep keep add keep keep keep keep
|
<mask> import versioned.host.exp.exponent.modules.api.components.barcodescanner.BarCodeScannerViewManager;
<mask> import versioned.host.exp.exponent.modules.api.components.lottie.LottiePackage;
<mask> import versioned.host.exp.exponent.modules.api.components.maps.MapsPackage;
<mask> import versioned.host.exp.exponent.modules.api.components.svg.RNSvgPackage;
<mask> import versioned.host.exp.exponent.modules.api.gl.GLViewManager;
<mask> import versioned.host.exp.exponent.modules.internal.ExponentAsyncStorageModule;
<mask> import versioned.host.exp.exponent.modules.internal.ExponentIntentModule;
<mask> import versioned.host.exp.exponent.modules.internal.ExponentUnsignedAsyncStorageModule;
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add { "name": "FBAudienceNetwork", "version": "4.18" }, </s> add <activity
android:name="com.facebook.ads.InterstitialAdActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
android/exponentview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> nativeModules.add(new KeepAwakeModule(reactContext));
<mask> nativeModules.add(new ExponentTestNativeModule(reactContext));
<mask> nativeModules.add(new WebBrowserModule(reactContext));
<mask> nativeModules.add(new AudioModule(reactContext));
<mask> } catch (JSONException e) {
<mask> EXL.e(TAG, e.toString());
<mask> } catch (UnsupportedEncodingException e) {
<mask> EXL.e(TAG, e.toString());
<mask> }
<mask> } else {
<mask> nativeModules.add(new ExponentUnsignedAsyncStorageModule(reactContext));
<mask> }
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add compile 'com.facebook.android:audience-network-sdk:4.19.0' </s> add { "name": "FBAudienceNetwork", "version": "4.18" }, </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add <activity
android:name="com.facebook.ads.InterstitialAdActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
android/exponentview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> List<ViewManager> viewManagers = new ArrayList<>(Arrays.<ViewManager>asList(
<mask> new LinearGradientManager(),
<mask> new VideoViewManager(),
<mask> new BarCodeScannerViewManager(),
<mask> new GLViewManager()
<mask> ));
<mask>
<mask> // Add view manager from 3rd party library packages.
<mask> addViewManagersFromPackages(reactContext, viewManagers, Arrays.<ReactPackage>asList(
<mask> new RNSvgPackage(),
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026561E54C41100A916B5 /* CTKNativeAdEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdEmitter.h; path = FBAds/CTKNativeAdEmitter.h; sourceTree = "<group>"; };
ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdEmitter.m; path = FBAds/CTKNativeAdEmitter.m; sourceTree = "<group>"; };
ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdManager.m; path = FBAds/CTKNativeAdManager.m; sourceTree = "<group>"; };
ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKAdSettingsManager.m; path = FBAds/CTKAdSettingsManager.m; sourceTree = "<group>"; };
ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKInterstitialAdManager.m; path = FBAds/CTKInterstitialAdManager.m; sourceTree = "<group>"; };
ADC0265B1E54C41100A916B5 /* CTKBannerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerView.m; path = FBAds/CTKBannerView.m; sourceTree = "<group>"; };
ADC0265C1E54C41100A916B5 /* CTKBannerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerView.h; path = FBAds/CTKBannerView.h; sourceTree = "<group>"; };
ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerViewManager.m; path = FBAds/CTKBannerViewManager.m; sourceTree = "<group>"; };
ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdView.m; path = FBAds/CTKNativeAdView.m; sourceTree = "<group>"; };
ADC0265F1E54C41100A916B5 /* CTKAdSettingsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKAdSettingsManager.h; path = FBAds/CTKAdSettingsManager.h; sourceTree = "<group>"; };
ADC026601E54C41100A916B5 /* CTKBannerViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerViewManager.h; path = FBAds/CTKBannerViewManager.h; sourceTree = "<group>"; };
ADC026611E54C41100A916B5 /* CTKInterstitialAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKInterstitialAdManager.h; path = FBAds/CTKInterstitialAdManager.h; sourceTree = "<group>"; };
ADC026621E54C41100A916B5 /* CTKNativeAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdManager.h; path = FBAds/CTKNativeAdManager.h; sourceTree = "<group>"; };
ADC026631E54C41100A916B5 /* CTKNativeAdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdView.h; path = FBAds/CTKNativeAdView.h; sourceTree = "<group>"; }; </s> add compile 'com.facebook.android:audience-network-sdk:4.19.0' </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add { "name": "FBAudienceNetwork", "version": "4.18" }, </s> add <activity
android:name="com.facebook.ads.InterstitialAdActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
android/exponentview/src/main/java/versioned/host/exp/exponent/ExponentPackage.java
|
keep keep keep add keep keep keep keep
|
<mask> A1F37F781CEFD6B2001E9EFC /* EXDisabledRedBox.m in Sources */ = {isa = PBXBuildFile; fileRef = A1F37F6C1CEFD6B2001E9EFC /* EXDisabledRedBox.m */; };
<mask> A1F37F791CEFD6B2001E9EFC /* EXFrameExceptionsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A1F37F6E1CEFD6B2001E9EFC /* EXFrameExceptionsManager.m */; };
<mask> A1F37F7A1CEFD6B2001E9EFC /* EXVersionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A1F37F701CEFD6B2001E9EFC /* EXVersionManager.m */; };
<mask> A2AABA28A2AEAFB462697CB3 /* libPods-Exponent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B1D1884419563A8205AED29 /* libPods-Exponent.a */; };
<mask> ADC3A9161DE68A56006C82DF /* EXLocalNotificationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC3A9151DE68A56006C82DF /* EXLocalNotificationManager.m */; };
<mask> B50625FF1E4B9E6100AC2748 /* EXAnimationViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B50625FC1E4B9E6100AC2748 /* EXAnimationViewManager.m */; };
<mask> B50626001E4B9E6100AC2748 /* EXContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = B50625FE1E4B9E6100AC2748 /* EXContainerView.m */; };
<mask> B509BCC51C6A88EC00A67CBB /* EXVersions.m in Sources */ = {isa = PBXBuildFile; fileRef = B509BCBB1C6A88EC00A67CBB /* EXVersions.m */; };
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026561E54C41100A916B5 /* CTKNativeAdEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdEmitter.h; path = FBAds/CTKNativeAdEmitter.h; sourceTree = "<group>"; };
ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdEmitter.m; path = FBAds/CTKNativeAdEmitter.m; sourceTree = "<group>"; };
ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdManager.m; path = FBAds/CTKNativeAdManager.m; sourceTree = "<group>"; };
ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKAdSettingsManager.m; path = FBAds/CTKAdSettingsManager.m; sourceTree = "<group>"; };
ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKInterstitialAdManager.m; path = FBAds/CTKInterstitialAdManager.m; sourceTree = "<group>"; };
ADC0265B1E54C41100A916B5 /* CTKBannerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerView.m; path = FBAds/CTKBannerView.m; sourceTree = "<group>"; };
ADC0265C1E54C41100A916B5 /* CTKBannerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerView.h; path = FBAds/CTKBannerView.h; sourceTree = "<group>"; };
ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerViewManager.m; path = FBAds/CTKBannerViewManager.m; sourceTree = "<group>"; };
ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdView.m; path = FBAds/CTKNativeAdView.m; sourceTree = "<group>"; };
ADC0265F1E54C41100A916B5 /* CTKAdSettingsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKAdSettingsManager.h; path = FBAds/CTKAdSettingsManager.h; sourceTree = "<group>"; };
ADC026601E54C41100A916B5 /* CTKBannerViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerViewManager.h; path = FBAds/CTKBannerViewManager.h; sourceTree = "<group>"; };
ADC026611E54C41100A916B5 /* CTKInterstitialAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKInterstitialAdManager.h; path = FBAds/CTKInterstitialAdManager.h; sourceTree = "<group>"; };
ADC026621E54C41100A916B5 /* CTKNativeAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdManager.h; path = FBAds/CTKNativeAdManager.h; sourceTree = "<group>"; };
ADC026631E54C41100A916B5 /* CTKNativeAdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdView.h; path = FBAds/CTKNativeAdView.h; sourceTree = "<group>"; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> remove new GLViewManager()
</s> add new GLViewManager(),
new NativeAdViewManager(reactContext),
new BannerViewManager(reactContext) </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep add keep keep keep keep keep keep
|
<mask> A1F37F6F1CEFD6B2001E9EFC /* EXVersionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXVersionManager.h; sourceTree = "<group>"; };
<mask> A1F37F701CEFD6B2001E9EFC /* EXVersionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXVersionManager.m; sourceTree = "<group>"; };
<mask> ADC3A9141DE68A56006C82DF /* EXLocalNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXLocalNotificationManager.h; sourceTree = "<group>"; };
<mask> ADC3A9151DE68A56006C82DF /* EXLocalNotificationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXLocalNotificationManager.m; sourceTree = "<group>"; };
<mask> B50625FB1E4B9E6100AC2748 /* EXAnimationViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXAnimationViewManager.h; sourceTree = "<group>"; };
<mask> B50625FC1E4B9E6100AC2748 /* EXAnimationViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXAnimationViewManager.m; sourceTree = "<group>"; };
<mask> B50625FD1E4B9E6100AC2748 /* EXContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXContainerView.h; sourceTree = "<group>"; };
<mask> B50625FE1E4B9E6100AC2748 /* EXContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EXContainerView.m; sourceTree = "<group>"; };
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> remove new GLViewManager()
</s> add new GLViewManager(),
new NativeAdViewManager(reactContext),
new BannerViewManager(reactContext) </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep add keep keep keep keep keep keep
|
<mask> A1F37F5A1CEFD6B2001E9EFC /* Api */ = {
<mask> isa = PBXGroup;
<mask> children = (
<mask> A1DCE8421DC3FC63009665FD /* GL */,
<mask> A1CDBE861D30781000C2A670 /* Components */,
<mask> B51C2AFF1DC7BB3200120834 /* OAuthViewController */,
<mask> B5844C341D482C3D0015C683 /* Permissions */,
<mask> 843175B21DDCF0440092B68B /* EXAccelerometer.h */,
<mask> 843175B31DDCF0440092B68B /* EXAccelerometer.m */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026561E54C41100A916B5 /* CTKNativeAdEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdEmitter.h; path = FBAds/CTKNativeAdEmitter.h; sourceTree = "<group>"; };
ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdEmitter.m; path = FBAds/CTKNativeAdEmitter.m; sourceTree = "<group>"; };
ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdManager.m; path = FBAds/CTKNativeAdManager.m; sourceTree = "<group>"; };
ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKAdSettingsManager.m; path = FBAds/CTKAdSettingsManager.m; sourceTree = "<group>"; };
ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKInterstitialAdManager.m; path = FBAds/CTKInterstitialAdManager.m; sourceTree = "<group>"; };
ADC0265B1E54C41100A916B5 /* CTKBannerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerView.m; path = FBAds/CTKBannerView.m; sourceTree = "<group>"; };
ADC0265C1E54C41100A916B5 /* CTKBannerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerView.h; path = FBAds/CTKBannerView.h; sourceTree = "<group>"; };
ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKBannerViewManager.m; path = FBAds/CTKBannerViewManager.m; sourceTree = "<group>"; };
ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTKNativeAdView.m; path = FBAds/CTKNativeAdView.m; sourceTree = "<group>"; };
ADC0265F1E54C41100A916B5 /* CTKAdSettingsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKAdSettingsManager.h; path = FBAds/CTKAdSettingsManager.h; sourceTree = "<group>"; };
ADC026601E54C41100A916B5 /* CTKBannerViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKBannerViewManager.h; path = FBAds/CTKBannerViewManager.h; sourceTree = "<group>"; };
ADC026611E54C41100A916B5 /* CTKInterstitialAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKInterstitialAdManager.h; path = FBAds/CTKInterstitialAdManager.h; sourceTree = "<group>"; };
ADC026621E54C41100A916B5 /* CTKNativeAdManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdManager.h; path = FBAds/CTKNativeAdManager.h; sourceTree = "<group>"; };
ADC026631E54C41100A916B5 /* CTKNativeAdView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTKNativeAdView.h; path = FBAds/CTKNativeAdView.h; sourceTree = "<group>"; }; </s> add ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep add keep keep keep keep keep keep
|
<mask> B5E4DB661E566614007D43DD /* AIRGoogleMapURLTileManager.m in Sources */,
<mask> B55FDEE41C7FDA560020AA8F /* EXFatalHandler.m in Sources */,
<mask> 1940B3401E15DF760015DA85 /* EXCrypto.m in Sources */,
<mask> B587F1E01D53DEB70071715C /* EXFileDownloader.m in Sources */,
<mask> A1CDBE991D3851F700C2A670 /* EXFileSystem.m in Sources */,
<mask> ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */,
<mask> B56FACAD1D4C0266009FC106 /* EXFingerprint.m in Sources */,
<mask> A1F37F731CEFD6B2001E9EFC /* EXFontLoader.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep add keep keep keep keep keep
|
<mask> B587F1E01D53DEB70071715C /* EXFileDownloader.m in Sources */,
<mask> A1CDBE991D3851F700C2A670 /* EXFileSystem.m in Sources */,
<mask> B56FACAD1D4C0266009FC106 /* EXFingerprint.m in Sources */,
<mask> A1F37F731CEFD6B2001E9EFC /* EXFontLoader.m in Sources */,
<mask> B5F12C991DAEDF960080ECA6 /* EXKernelReactAppManager.m in Sources */,
<mask> 1936012B1D67ABCF007C0EE0 /* RNSVGText.m in Sources */,
<mask> A1F37F791CEFD6B2001E9EFC /* EXFrameExceptionsManager.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep add keep keep keep keep keep keep
|
<mask> B575EE9E1D53EEC300DCABBC /* EXJavaScriptResource.m in Sources */,
<mask> B5E4DB611E566614007D43DD /* AIRGoogleMapPolygon.m in Sources */,
<mask> 1936011D1D67ABCF007C0EE0 /* RNSVGNodeManager.m in Sources */,
<mask> A1DCE8471DC3FC63009665FD /* EXGLView.m in Sources */,
<mask> B5678C5F1DB6D65B00380A6E /* EXFrame.m in Sources */,
<mask> B55089791D06378B009FBBC5 /* EXKernel.m in Sources */,
<mask> B5218E851D2475A000C54B61 /* EXKernelBridgeRecord.m in Sources */,
<mask> 78C77D2F1DC332870069CC59 /* AIRMapUrlTileManager.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; };
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep add keep keep keep keep
|
<mask> B5218E731D22FC7800C54B61 /* EXRemoteNotificationManager.m in Sources */,
<mask> B52336AF1DAD6A3A001C0B5E /* EXAVPermissionRequester.m in Sources */,
<mask> 193601181D67ABCF007C0EE0 /* RNSVGLine.m in Sources */,
<mask> B5844C3B1D482D710015C683 /* EXRemoteNotificationRequester.m in Sources */,
<mask> B55FDEFA1C7FE1310020AA8F /* EXRootViewController.m in Sources */,
<mask> B5553F961CEFBD1200555008 /* EXShellManager.m in Sources */,
<mask> 843175B41DDCF0440092B68B /* EXAccelerometer.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */, </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep keep add keep keep keep keep
|
<mask> B5E4DB5E1E566614007D43DD /* AIRGoogleMapManager.m in Sources */,
<mask> 193601221D67ABCF007C0EE0 /* RNSVGRadialGradient.m in Sources */,
<mask> 193601141D67ABCF007C0EE0 /* RNSVGGroup.m in Sources */,
<mask> A16EE77D1D56911100634425 /* EXVideo.m in Sources */,
<mask> F77DDB8B1E04774000624CA2 /* EXWebBrowser.m in Sources */,
<mask> ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */,
<mask> 1936010B1D67ABCF007C0EE0 /* RNSVGBrushConverter.m in Sources */,
<mask> 1981B9F71E3C28BA00057CA9 /* EXKeepAwake.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */, </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep keep add keep keep keep keep
|
<mask> 193601141D67ABCF007C0EE0 /* RNSVGGroup.m in Sources */,
<mask> A16EE77D1D56911100634425 /* EXVideo.m in Sources */,
<mask> ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */,
<mask> F77DDB8B1E04774000624CA2 /* EXWebBrowser.m in Sources */,
<mask> 1936010B1D67ABCF007C0EE0 /* RNSVGBrushConverter.m in Sources */,
<mask> 1981B9F71E3C28BA00057CA9 /* EXKeepAwake.m in Sources */,
<mask> B50626001E4B9E6100AC2748 /* EXContainerView.m in Sources */,
<mask> 193601291D67ABCF007C0EE0 /* RNSVGSvgView.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */, </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep keep add keep keep keep keep
|
<mask> 1936010B1D67ABCF007C0EE0 /* RNSVGBrushConverter.m in Sources */,
<mask> 1981B9F71E3C28BA00057CA9 /* EXKeepAwake.m in Sources */,
<mask> B50626001E4B9E6100AC2748 /* EXContainerView.m in Sources */,
<mask> 193601291D67ABCF007C0EE0 /* RNSVGSvgView.m in Sources */,
<mask> 1936011F1D67ABCF007C0EE0 /* RNSVGPathManager.m in Sources */,
<mask> A16EE77E1D56911100634425 /* EXVideoManager.m in Sources */,
<mask> 193601101D67ABCF007C0EE0 /* RNSVGDefs.m in Sources */,
<mask> 1936010C1D67ABCF007C0EE0 /* RNSVGCircle.m in Sources */,
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026641E54C41100A916B5 /* CTKNativeAdEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026571E54C41100A916B5 /* CTKNativeAdEmitter.m */; };
ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026581E54C41100A916B5 /* CTKNativeAdManager.m */; };
ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC026591E54C41100A916B5 /* CTKAdSettingsManager.m */; };
ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265A1E54C41100A916B5 /* CTKInterstitialAdManager.m */; };
ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265B1E54C41100A916B5 /* CTKBannerView.m */; };
ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265D1E54C41100A916B5 /* CTKBannerViewManager.m */; };
ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC0265E1E54C41100A916B5 /* CTKNativeAdView.m */; }; </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */, </s> add ADC026661E54C41200A916B5 /* CTKAdSettingsManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
ios/Exponent.xcodeproj/project.pbxproj
|
keep keep add keep keep keep keep
|
<mask> android:label="@string/app_name"
<mask> android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<mask>
<mask> <service
<mask> android:name=".ExponentIntentService"
<mask> android:exported="false" />
<mask>
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> add { "name": "FBAudienceNetwork", "version": "4.18" }, </s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */, </s> add ADC026651E54C41100A916B5 /* CTKNativeAdManager.m in Sources */, </s> add ADC026681E54C41200A916B5 /* CTKBannerView.m in Sources */, </s> add ADC026671E54C41200A916B5 /* CTKInterstitialAdManager.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
template-files/android/AndroidManifest.xml
|
keep add keep keep keep keep keep keep
|
<mask> { "name": "CocoaLumberjack", "version": "~> 2.3" },
<mask> { "name": "Crashlytics", "version": "~> 3.8" },
<mask> { "name": "FBSDKCoreKit", "version": "~> 4.15" },
<mask> { "name": "FBSDKLoginKit", "version": "~> 4.15" },
<mask> { "name": "FBSDKShareKit", "version": "~> 4.15" },
<mask> { "name": "Fabric", "version": "~> 1.6" },
<mask> { "name": "Google/SignIn", "version": "~> 3.0" },
<mask> { "name": "GoogleMaps", "version": "~> 2.2.0" },
</s> Facebook Ads module (#108)
fbshipit-source-id: 5953190 </s> remove } catch (JSONException e) {
EXL.e(TAG, e.toString());
} catch (UnsupportedEncodingException e) {
</s> add nativeModules.add(new NativeAdManager(reactContext));
nativeModules.add(new AdSettingsManager(reactContext));
nativeModules.add(new InterstitialAdManager(reactContext));
} catch (JSONException | UnsupportedEncodingException e) { </s> add compile 'com.facebook.android:audience-network-sdk:4.19.0' </s> add ADC026541E54C40400A916B5 /* FBAds */, </s> add <activity
android:name="com.facebook.ads.InterstitialAdActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
</s> add ADC026691E54C41200A916B5 /* CTKBannerViewManager.m in Sources */, </s> add ADC0266A1E54C41200A916B5 /* CTKNativeAdView.m in Sources */,
|
https://github.com/expo/expo/commit/0a5c5418e36f6fbca2153c9d7d02ba82523d0d70
|
template-files/ios/dependencies.json
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> #import <Foundation/Foundation.h>
<mask>
<mask> #import <ExpoModulesCore/EXInternalModule.h>
<mask> #import <ExpoModulesCore/EXExportedModule.h>
<mask> #import <ExpoModulesCore/EXViewManager.h>
<mask> #import <ExpoModulesCore/EXModuleRegistryDelegate.h>
<mask>
<mask> NS_ASSUME_NONNULL_BEGIN
<mask>
<mask> @interface EXModuleRegistry : NSObject
</s> [core][ios] Remove legacy view managers (#21760) </s> remove - (NSArray<EXViewManager *> *)getAllViewManagers;
</s> add </s> remove - (void)registerViewManager:(EXViewManager *)viewManager;
</s> add </s> remove viewManagers:(NSSet<EXViewManager *> *)viewManagers
</s> add
|
https://github.com/expo/expo/commit/0b4ca2539b683afd915da1e0751040157989ed5c
|
packages/expo-modules-core/ios/ModuleRegistry/EXModuleRegistry.h
|
keep keep keep keep replace keep keep keep keep replace
|
<mask> @interface EXModuleRegistry : NSObject
<mask>
<mask> - (instancetype)initWithInternalModules:(NSSet<id<EXInternalModule>> *)internalModules
<mask> exportedModules:(NSSet<EXExportedModule *> *)exportedModules
<mask> viewManagers:(NSSet<EXViewManager *> *)viewManagers
<mask> singletonModules:(NSSet *)singletonModules;
<mask>
<mask> - (void)registerInternalModule:(id<EXInternalModule>)internalModule;
<mask> - (void)registerExportedModule:(EXExportedModule *)exportedModule;
<mask> - (void)registerViewManager:(EXViewManager *)viewManager;
</s> [core][ios] Remove legacy view managers (#21760) </s> remove - (NSArray<EXViewManager *> *)getAllViewManagers;
</s> add </s> remove #import <ExpoModulesCore/EXViewManager.h>
</s> add
|
https://github.com/expo/expo/commit/0b4ca2539b683afd915da1e0751040157989ed5c
|
packages/expo-modules-core/ios/ModuleRegistry/EXModuleRegistry.h
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> - (id)getSingletonModuleForName:(NSString *)singletonModuleName;
<mask>
<mask> - (NSArray<id<EXInternalModule>> *)getAllInternalModules;
<mask> - (NSArray<EXExportedModule *> *)getAllExportedModules;
<mask> - (NSArray<EXViewManager *> *)getAllViewManagers;
<mask> - (NSArray *)getAllSingletonModules;
<mask>
<mask> @end
<mask>
<mask> NS_ASSUME_NONNULL_END
</s> [core][ios] Remove legacy view managers (#21760) </s> remove - (void)registerViewManager:(EXViewManager *)viewManager;
</s> add </s> remove viewManagers:(NSSet<EXViewManager *> *)viewManagers
</s> add </s> remove #import <ExpoModulesCore/EXViewManager.h>
</s> add
|
https://github.com/expo/expo/commit/0b4ca2539b683afd915da1e0751040157989ed5c
|
packages/expo-modules-core/ios/ModuleRegistry/EXModuleRegistry.h
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> #import "EXVersionManager.h"
<mask> #import "EXVersions.h"
<mask>
<mask> #import <EXConstants/EXConstantsService.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> #import <React/RCTUtils.h>
<mask> #import <React/RCTBridge.h>
<mask>
<mask> #import <ExpoModulesCore/EXModuleRegistryProvider.h>
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> remove @import EXManifests;
</s> add </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
@import EXManifests;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesNewUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Client/EXHomeAppManager.m
|
keep keep add keep keep keep keep keep keep
|
<mask> #import <ExpoModulesCore/EXModuleRegistryProvider.h>
<mask>
<mask> @import EXManifests;
<mask>
<mask> NSString * const kEXHomeLaunchUrlDefaultsKey = @"EXKernelLaunchUrlDefaultsKey";
<mask> NSString *kEXHomeBundleResourceName = @"kernel.ios";
<mask> NSString *kEXHomeManifestResourceName = @"kernel-manifest";
<mask>
<mask> @implementation EXHomeAppManager
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> add @import EXManifests;
</s> add @import EXManifests;
</s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @import EXManifests;
@import EXUpdates; </s> remove @import EXManifests;
</s> add </s> add @import EXManifests;
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Client/EXHomeAppManager.m
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> #import "EXKernelLinkingManager.h"
<mask> #import "EXKernelUtil.h"
<mask> #import "EXVersions.h"
<mask>
<mask> @import EXManifests;
<mask>
<mask> #import <React/RCTConvert.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NSString * const kEXPublicKeyUrl = @"https://exp.host/--/manifest-public-key";
<mask> NSString * const EXRuntimeErrorDomain = @"incompatible-runtime";
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @import EXManifests;
@import EXUpdates; </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> add @import EXManifests;
</s> add @import EXManifests;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
@import EXManifests;
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Kernel/AppLoader/CachedResource/EXManifestResource.m
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> @import EXManifests;
<mask>
<mask> #import <React/RCTConvert.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NSString * const kEXPublicKeyUrl = @"https://exp.host/--/manifest-public-key";
<mask> NSString * const EXRuntimeErrorDomain = @"incompatible-runtime";
<mask>
<mask> @interface EXManifestResource ()
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove @import EXManifests;
</s> add </s> add @import EXManifests;
</s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> add @import EXManifests;
</s> add @import EXUpdates; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Kernel/AppLoader/CachedResource/EXManifestResource.m
|
keep add keep keep keep keep keep keep
|
<mask> #import <React/RCTUtils.h>
<mask>
<mask> NSString *kEXKernelBridgeDidForegroundNotification = @"EXKernelBridgeDidForegroundNotification";
<mask> NSString *kEXKernelBridgeDidBackgroundNotification = @"EXKernelBridgeDidBackgroundNotification";
<mask>
<mask> @implementation EXKernelAppRecord
<mask>
<mask> - (instancetype)initWithManifestUrl:(NSURL *)manifestUrl initialProps:(NSDictionary *)initialProps
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> add @import EXUpdates; </s> add @import EXManifests;
</s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove @import EXManifests;
</s> add </s> add @import EXManifests;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @import EXManifests;
@import EXUpdates;
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Kernel/Core/EXKernelAppRecord.m
|
keep add keep keep keep keep keep keep
|
<mask> #import <React/RCTBridge.h>
<mask>
<mask> NSString * const EXUpdatesEventName = @"Expo.nativeUpdatesEvent";
<mask> NSString * const EXUpdatesErrorEventType = @"error";
<mask> NSString * const EXUpdatesUpdateAvailableEventType = @"updateAvailable";
<mask> NSString * const EXUpdatesNotAvailableEventType = @"noUpdateAvailable";
<mask>
<mask> @implementation EXUpdatesManager
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> add @import EXManifests;
</s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove @import EXManifests;
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @import EXManifests;
@import EXUpdates; </s> add @import EXUpdates; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Kernel/Services/EXUpdatesManager.m
|
keep keep keep add keep keep keep keep
|
<mask> #else
<mask> #import "Expo_Go-Swift.h"
<mask> #endif // defined(EX_DETACHED)
<mask>
<mask>
<mask> #define EX_INTERFACE_ORIENTATION_USE_MANIFEST 0
<mask>
<mask> // when we encounter an error and auto-refresh, we may actually see a series of errors.
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove extension Dictionary where Key == String {
</s> add public extension Dictionary where Key == String { </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesNewUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesBareUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Kernel/Views/EXAppViewController.m
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> #import <EXUpdates/EXUpdatesConfig.h>
<mask> #import <EXUpdates/EXUpdatesDatabase.h>
<mask> #import <EXUpdates/EXUpdatesSelectionPolicy.h>
<mask> #import <EXUpdates/EXUpdatesService.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NS_ASSUME_NONNULL_BEGIN
<mask>
<mask> @protocol EXUpdatesBindingDelegate
<mask>
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> add #import "EXUpdates-Swift.h"
@import EXManifests;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
ios/Exponent/Versioned/Core/UniversalModules/EXUpdatesBinding.h
|
keep keep keep keep replace replace keep keep
|
<mask> public override func sdkVersion() -> String? {
<mask> return rawManifestJSON().optionalValue(forKey: "sdkVersion")
<mask> }
<mask>
<mask> public func assets() -> [Any]? {
<mask> return rawManifestJSON().optionalValue(forKey: "assets")
<mask> }
<mask> }
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove extension Optional {
</s> add public extension Optional { </s> remove extension Dictionary where Key == String {
</s> add public extension Dictionary where Key == String { </s> remove NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusEmbedded config:config error:&err];
</s> add NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusStatusEmbedded config:config error:&err]; </s> remove NSDictionary *metadata = update.manifestJSON[@"metadata"];
</s> add NSDictionary *metadata = update.manifest.rawManifestJSON[@"metadata"]; </s> remove if (!filters || !update.manifestJSON) {
</s> add if (!filters || !update.manifest.rawManifestJSON) { </s> remove 'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
}
</s> add 'USER_HEADER_SEARCH_PATHS' => '"${CONFIGURATION_TEMP_DIR}/EXUpdates.build/DerivedSources"',
'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
}
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-manifests/ios/EXManifests/EXManifestsBaseLegacyManifest.swift
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> backwards compatibility with the previous objective-c implementation so that we don't need to do
<mask> error handling at every callsite. When all the code is swift, we might be able to use these exceptions.
<mask> */
<mask>
<mask> extension Dictionary where Key == String {
<mask> func optionalValue<T>(forKey: String) -> T? {
<mask> guard let value = self[forKey] else {
<mask> return nil
<mask> }
<mask>
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove extension Optional {
</s> add public extension Optional { </s> remove public func assets() -> [Any]? {
return rawManifestJSON().optionalValue(forKey: "assets")
</s> add public func assets() -> [[String: Any]]? {
return self.rawManifestJSON().optionalValue(forKey: "assets") </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove if (!filters || !update.manifestJSON) {
</s> add if (!filters || !update.manifest.rawManifestJSON) { </s> remove NSDictionary *metadata = update.manifestJSON[@"metadata"];
</s> add NSDictionary *metadata = update.manifest.rawManifestJSON[@"metadata"];
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-manifests/ios/EXManifests/EXManifestsManifest.swift
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> return value as! T
<mask> }
<mask> }
<mask>
<mask> extension Optional {
<mask> func `let`<U>(_ transform: (_ it: Wrapped) throws -> U?) rethrows -> U? {
<mask> if let x = self {
<mask> return try transform(x)
<mask> }
<mask> return nil
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove public func assets() -> [Any]? {
return rawManifestJSON().optionalValue(forKey: "assets")
</s> add public func assets() -> [[String: Any]]? {
return self.rawManifestJSON().optionalValue(forKey: "assets") </s> remove extension Dictionary where Key == String {
</s> add public extension Dictionary where Key == String { </s> remove NSDictionary *metadata = update.manifestJSON[@"metadata"];
</s> add NSDictionary *metadata = update.manifest.rawManifestJSON[@"metadata"]; </s> remove NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusEmbedded config:config error:&err];
</s> add NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusStatusEmbedded config:config error:&err]; </s> remove if (!filters || !update.manifestJSON) {
</s> add if (!filters || !update.manifest.rawManifestJSON) { </s> remove 'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
}
</s> add 'USER_HEADER_SEARCH_PATHS' => '"${CONFIGURATION_TEMP_DIR}/EXUpdates.build/DerivedSources"',
'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
'DEFINES_MODULE' => 'YES',
'SWIFT_COMPILATION_MODE' => 'wholemodule'
}
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-manifests/ios/EXManifests/EXManifestsManifest.swift
|
keep keep keep keep replace replace replace replace replace keep keep
|
<mask> test_spec.dependency 'ExpoModulesTestCore'
<mask> test_spec.dependency 'OCMockito', '~> 6.0'
<mask>
<mask> test_spec.pod_target_xcconfig = {
<mask> 'GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS' => 'YES',
<mask> 'GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS' => 'YES',
<mask> 'DEFINES_MODULE' => 'YES',
<mask> 'SWIFT_COMPILATION_MODE' => 'wholemodule'
<mask> }
<mask> end
<mask> end
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove extension Optional {
</s> add public extension Optional { </s> remove NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusEmbedded config:config error:&err];
</s> add NSArray<EXUpdatesUpdate *> *updatesWithEmbeddedStatus = [database allUpdatesWithStatus:EXUpdatesUpdateStatusStatusEmbedded config:config error:&err]; </s> remove NSDictionary *metadata = update.manifestJSON[@"metadata"];
</s> add NSDictionary *metadata = update.manifest.rawManifestJSON[@"metadata"]; </s> remove public func assets() -> [Any]? {
return rawManifestJSON().optionalValue(forKey: "assets")
</s> add public func assets() -> [[String: Any]]? {
return self.rawManifestJSON().optionalValue(forKey: "assets") </s> remove if (!filters || !update.manifestJSON) {
</s> add if (!filters || !update.manifest.rawManifestJSON) { </s> remove extension Dictionary where Key == String {
</s> add public extension Dictionary where Key == String {
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-updates/ios/EXUpdates.podspec
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> #import <EXUpdates/EXUpdatesAppLoader.h>
<mask> #import <EXUpdates/EXUpdatesAsset.h>
<mask> #import <EXUpdates/EXUpdatesDatabase.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NS_ASSUME_NONNULL_BEGIN
<mask>
<mask> @interface EXUpdatesAppLoader ()
<mask>
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove #import <EXUpdates/EXUpdatesNewUpdate.h>
</s> add #import "EXUpdates-Swift.h" </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove #import <EXUpdates/EXUpdatesLegacyUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> add #if __has_include(<EXUpdates/EXUpdates-Swift.h>)
#import <EXUpdates/EXUpdates-Swift.h>
#else
#import "EXUpdates-Swift.h"
#endif
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate;
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-updates/ios/EXUpdates/AppLoader/EXUpdatesAppLoader+Private.h
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> #import <EXUpdates/EXUpdatesAsset.h>
<mask> #import <EXUpdates/EXUpdatesConfig.h>
<mask> #import <EXUpdates/EXUpdatesDatabase.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NS_ASSUME_NONNULL_BEGIN
<mask>
<mask> typedef BOOL (^EXUpdatesAppLoaderManifestBlock)(EXUpdatesUpdate *update);
<mask> typedef void (^EXUpdatesAppLoaderAssetBlock) (EXUpdatesAsset *asset, NSUInteger successfulAssetCount, NSUInteger failedAssetCount, NSUInteger totalAssetCount);
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> add @class EXUpdatesUpdate;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> add @class EXUpdatesUpdate;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesNewUpdate.h>
</s> add #import "EXUpdates-Swift.h"
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-updates/ios/EXUpdates/AppLoader/EXUpdatesAppLoader.h
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> #import <EXUpdates/EXUpdatesAppLauncher.h>
<mask> #import <EXUpdates/EXUpdatesConfig.h>
<mask> #import <EXUpdates/EXUpdatesDatabase.h>
<mask> #import <EXUpdates/EXUpdatesSelectionPolicy.h>
<mask> #import <EXUpdates/EXUpdatesUpdate.h>
<mask>
<mask> NS_ASSUME_NONNULL_BEGIN
<mask>
<mask> typedef NS_ENUM(NSInteger, EXUpdatesBackgroundUpdateStatus) {
<mask> EXUpdatesBackgroundUpdateStatusError = 0,
</s> [exupdates][ios] Start converting to swift (#21320)
# Why
Start the conversion process of the expo-updates library by converting
EXUpdatesUpdate and subclasses.
# How
Convert manually... lol.
The main note is that we can't use swift nullability/type forcing
operators (`!`, `as!`, `as?`) etc since the previous implementation was
relying upon NSAssert to raise an NSException which is caught in the
calling code, so I added new extension functions to replicate the
behavior (similar to EXManifests util functions).
# Test Plan
Build and run all tests.
# Checklist
<!--
Please check the appropriate items below if they apply to your diff.
This is required for changes to Expo modules.
-->
- [ ] Documentation is up to date to reflect these changes (eg:
https://docs.expo.dev and README.md).
- [ ] Conforms with the [Documentation Writing Style
Guide](https://github.com/expo/expo/blob/main/guides/Expo%20Documentation%20Writing%20Style%20Guide.md)
- [ ] This diff will work correctly for `expo prebuild` & EAS Build (eg:
updated a module plugin). </s> add @class EXUpdatesUpdate;
</s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add @class EXUpdatesUpdate; </s> remove #import <EXUpdates/EXUpdatesUpdate.h>
</s> add
|
https://github.com/expo/expo/commit/0b66f7ddca830fc07b994e1371b091b24abb88ab
|
packages/expo-updates/ios/EXUpdates/AppLoader/EXUpdatesAppLoaderTask.h
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.