Merge branch 'main' into @szymczak/migrate-to-npm

Expensify · Nov 6, 2024 · 8c694b1 · 8c694b1
2 parents d6fa86a + 4a62d9b
commit 8c694b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
@@ -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
diff --git a/android/build.gradle b/android/build.gradle
@@ -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/**",
@@ -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 {

diff --git a/android/src/main/java/com/expensify/livemarkdown/spans/MarkdownEmojiSpan.java b/android/src/main/java/com/expensify/livemarkdown/spans/MarkdownEmojiSpan.java
@@ -2,8 +2,10 @@
 
 import android.text.style.AbsoluteSizeSpan;
 
+import com.facebook.react.uimanager.PixelUtil;
+
 public class MarkdownEmojiSpan extends AbsoluteSizeSpan implements MarkdownSpan {
   public MarkdownEmojiSpan(float fontSize) {
-    super((int) fontSize, true);
+    super((int) PixelUtil.toPixelFromDIP(fontSize), false);
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.180",
+  "version": "0.1.183",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",