Skip to content

Commit b4e11d3

Browse files
msluszniakclaude
andcommitted
fix: resolve merge conflicts, fix package refs, and remove tracked generated files
- Resolve merge conflict in .github/workflows/ci.yml (keep topological prepare) - Resolve merge conflict in yarn.lock and fix stale checksums - Resolve merge conflict in ResourceFetcher.ts - Update bare_rn: rename @rn-executorch/bare-adapter to @react-native-executorch/bare-resource-fetcher - Switch bare_rn dependencies from file: to workspace: protocol - Remove apps/bare_rn/android, ios, and yarn.lock from git index (covered by .gitignore) - Remove integration test model assets from git index; add .gitignore to prevent re-tracking Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 8816fbc commit b4e11d3

Some content is hidden

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

51 files changed

+258
-308318
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,7 @@ jobs:
2424
run: yarn lint
2525

2626
- name: Typecheck files
27-
<<<<<<< HEAD
2827
run: yarn workspaces foreach --all --topological-dev run prepare && yarn typecheck
29-
=======
30-
run: |
31-
cd packages/react-native-executorch
32-
yarn prepare
33-
cd ../../
34-
yarn typecheck
35-
>>>>>>> 614835e1 (chore: move yarn prepare from adapter typecheck scripts to CI workflow)
3628

3729
build-library:
3830
runs-on: ubuntu-latest

apps/bare_rn/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
useLLM,
1818
LLAMA3_2_1B_SPINQUANT,
1919
} from 'react-native-executorch';
20-
import { BareResourceFetcher } from '@rn-executorch/bare-adapter';
20+
import { BareResourceFetcher } from '@react-native-executorch/bare-resource-fetcher';
2121
import { setConfig } from '@kesha-antonov/react-native-background-downloader';
2222
import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
2323

apps/bare_rn/android/app/build.gradle

Lines changed: 0 additions & 121 deletions
This file was deleted.
-2.2 KB
Binary file not shown.

apps/bare_rn/android/app/proguard-rules.pro

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

apps/bare_rn/android/app/src/main/AndroidManifest.xml

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

apps/bare_rn/android/app/src/main/java/com/bare_rn/MainActivity.kt

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

apps/bare_rn/android/app/src/main/java/com/bare_rn/MainApplication.kt

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

apps/bare_rn/android/app/src/main/res/drawable/rn_edit_text_material.xml

Lines changed: 0 additions & 37 deletions
This file was deleted.
-2.98 KB
Binary file not shown.

0 commit comments

Comments
 (0)