Skip to content

Commit

Permalink
Merge branch 'main' into @tomekzaw/line-height
Browse files Browse the repository at this point in the history
  • Loading branch information
tomekzaw committed Nov 6, 2024
2 parents 29b8bc9 + b110e92 commit 3ccb597
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ jobs:

- name: Build app
working-directory: example
run: npx react-native@latest run-ios --no-packager
run: npx react-native run-ios --no-packager
15 changes: 6 additions & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ android {

packagingOptions {
doNotStrip '**/**/*.so'
// For some reason gradle only complains about the duplicated version of librrc_root and libreact_render libraries
// while there are more libraries copied in intermediates folder of the lib build directory, we exclude
// only the ones that make the build fail (ideally we should only include libreanimated but we
// are only allowed to specify exclude patterns)
excludes = [
"META-INF",
"META-INF/**",
Expand All @@ -152,17 +156,10 @@ android {
"**/libjsi.so",
"**/libreactnativejni.so",
"**/libreactnative.so",
"**/libreact_render*.so",
"**/librrc_root.so",
]
}

packagingOptions {
// For some reason gradle only complains about the duplicated version of librrc_root and libreact_render libraries
// while there are more libraries copied in intermediates folder of the lib build directory, we exclude
// only the ones that make the build fail (ideally we should only include libreanimated but we
// are only allowed to specify exlude patterns)
exclude "**/libreact_render*.so"
exclude "**/librrc_root.so"
}
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@expensify/react-native-live-markdown",
"version": "0.1.180",
"version": "0.1.181",
"description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down

0 comments on commit 3ccb597

Please sign in to comment.