Skip to content

Commit 21da8c6

Browse files
committed
fix: changes after CR
1 parent 258bc70 commit 21da8c6

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
flavor: expo${{ matrix.version }}
7171
rn-project-path: apps/ExpoApp${{ matrix.version }}
72-
rn-project-maven-path: com/callstack/rnbrownfield/demo/expoapp/brownfieldlib
72+
rn-project-maven-path: com/callstack/rnbrownfield/demo/expoapp${{ matrix.version }}/brownfieldlib
7373

7474
android-androidapp-vanilla:
7575
name: Android road test (RNApp & AndroidApp - Vanilla)

apps/ExpoApp55/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"web": "expo start --web",
1010
"lint": "expo lint",
1111
"prebuild": "expo prebuild",
12-
"brownfield:prepare:android:ci": "cd .. && node --experimental-strip-types --no-warnings ./scripts/prepare-android-build-gradle-for-ci.ts ExpoApp54",
12+
"brownfield:prepare:android:ci": "cd .. && node --experimental-strip-types --no-warnings ./scripts/prepare-android-build-gradle-for-ci.ts ExpoApp55",
1313
"brownfield:package:android": "brownfield package:android --module-name brownfieldlib --variant release",
1414
"brownfield:publish:android": "brownfield publish:android --module-name brownfieldlib",
1515
"brownfield:package:ios": "brownfield package:ios --scheme BrownfieldLib --configuration Release"

apps/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This directory contains demo projects showcasing the usage of the `react-native-
44

55
- `RNApp` - the React Native application that is packaged to AAR and XCFramework archives and integrated into native projects
66
- `ExpoApp54` - the Expo application that is packaged analogously to the above using React Native Brownfield Expo config plugin; this app uses Expo SDK v54, which is an important test case since pre-55 versions require additional configuration steps
7-
- `ExpoApp` - another Expo application similar to `ExpoApp55`, but using Expo SDK v55
7+
- `ExpoApp55` - another Expo application similar to `ExpoApp54`, but using Expo SDK v55
88
- `AndroidApp` - the native Android application that integrates the RNApp AAR package (a "consumer" of the RNApp library); it comes in two flavors:
99
- `expo` - which uses the artifact produced from `ExpoApp`
1010
- `vanilla` - which uses the artifact produced from `RNApp`
@@ -14,4 +14,4 @@ This directory contains demo projects showcasing the usage of the `react-native-
1414

1515
## Additional notes
1616

17-
There are 2 demo apps for Expo: `ExpoApp` (Expo 55 SDK) and `ExpoApp54` (Expo 54 SDK). This is to test our setup works with bost pre- and post-55 Expo SDK versions. It is important since the pre-55 Expo versions require additional handling, which is not applied by our Expo config plugin for Expo >= 55.
17+
There are 2 demo apps for Expo: `ExpoApp55` (Expo 55 SDK) and `ExpoApp54` (Expo 54 SDK). This is to test our setup works with both pre- and post-55 Expo SDK versions. It is important since the pre-55 Expo versions require additional handling, which is not applied by our Expo config plugin for Expo >= 55.

docs/docs/docs/getting-started/examples.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ It contains the following apps:
66

77
- `RNApp` - a React Native app that is packaged using React Native Brownfield to an artifact consumed in native apps, in which you can refer to an exemplar usage of the library for packaging a React Native app to a consumable artifact
88
- `ExpoApp54` - the Expo application that is packaged analogously to the above using React Native Brownfield Expo config plugin; this app uses Expo SDK v54, which is an important test case since pre-55 versions require additional configuration steps
9-
- `ExpoApp` - another Expo application similar to `ExpoApp55`, but using Expo SDK v55
9+
- `ExpoApp55` - another Expo application similar to `ExpoApp54`, but using Expo SDK v55
1010
- `AndroidApp` - an Android app consuming the packaged artifact from `RNApp` or `ExpoApp`, in which you can refer to an exemplar usage of the library for integrating React Native Brownfield into a native Android app; this app comes in two flavors:
1111
- `expo` - which uses the artifact produced from `ExpoApp`
1212
- `vanilla` - which uses the artifact produced from `RNApp`
@@ -16,6 +16,6 @@ It contains the following apps:
1616

1717
## Additional notes
1818

19-
There are 2 demo apps for Expo: `ExpoApp` (Expo 55 SDK) and `ExpoApp54` (Expo 54 SDK). This is to test our setup works with bost pre- and post-55 Expo SDK versions. It is important since the pre-55 Expo versions require additional handling, which is not applied by our Expo config plugin for Expo >= 55.
19+
There are 2 demo apps for Expo: `ExpoApp55` (Expo 55 SDK) and `ExpoApp54` (Expo 54 SDK). This is to test our setup works with both pre- and post-55 Expo SDK versions. It is important since the pre-55 Expo versions require additional handling, which is not applied by our Expo config plugin for Expo >= 55.
2020

2121
The ReactBrownfield iOS Pods project (namely `ExpoHostRuntime.swift`) depends on the `EXPO_SDK_GTE_55` compile-time define. This define is added to the project from the Podfile, injected by the Expo config plugin for Expo SDK versions >= 55.

packages/react-native-brownfield/src/expo-config-plugin/android/utils/__tests__/hermes.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { getHermesArtifact } from '../hermes';
44
import { Logger } from '../../../logging';
55

66
// Mock Logger.logWarning to prevent console output during tests
7-
vi.mock('../../logging', () => ({
7+
vi.mock('../../../logging', () => ({
88
Logger: {
99
logWarning: vi.fn(),
1010
},

0 commit comments

Comments
 (0)