Skip to content

Commit

Permalink
Merge branch 'main' into @tomekzaw/worklets
Browse files Browse the repository at this point in the history
  • Loading branch information
tomekzaw committed Oct 10, 2024
2 parents fb1173b + b97a0a6 commit 51eecd5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# any js file inside android and ios folders
**/android/**/*.js
**/ios/**/*.js
**/apple/**/*.js

# Output of the build process & scripts
lib/**/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
paths:
- .github/workflows/build-ios.yml
- RNLiveMarkdown.podspec
- ios/**
- apple/**
- cpp/**
- example/package.json
- example/ios/**
Expand All @@ -17,7 +17,7 @@ on:
paths:
- .github/workflows/build-ios.yml
- RNLiveMarkdown.podspec
- ios/**
- apple/**
- cpp/**
- example/package.json
- example/ios/**
Expand Down
2 changes: 1 addition & 1 deletion RNLiveMarkdown.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Pod::Spec.new do |s|
s.platforms = { :ios => "11.0", :visionos => "1.0" }
s.source = { :git => "https://github.com/expensify/react-native-live-markdown.git", :tag => "#{s.version}" }

s.source_files = "ios/**/*.{h,m,mm}", "cpp/**/*.{h,cpp}"
s.source_files = "apple/**/*.{h,m,mm}", "cpp/**/*.{h,cpp}"

s.dependency "RNReanimated/worklets"

Expand Down
8 changes: 4 additions & 4 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1497,7 +1497,7 @@ PODS:
- React-logger (= 0.75.3)
- React-perflogger (= 0.75.3)
- React-utils (= 0.75.3)
- RNLiveMarkdown (0.1.168):
- RNLiveMarkdown (0.1.170):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1517,10 +1517,10 @@ PODS:
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNLiveMarkdown/newarch (= 0.1.168)
- RNLiveMarkdown/newarch (= 0.1.170)
- RNReanimated/worklets
- Yoga
- RNLiveMarkdown/newarch (0.1.168):
- RNLiveMarkdown/newarch (0.1.170):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1897,7 +1897,7 @@ SPEC CHECKSUMS:
React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
ReactCodegen: ff95a93d5ab5d9b2551571886271478eaa168565
ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
RNLiveMarkdown: f30db4453a74611815e71a18d13a9b30de9b7493
RNLiveMarkdown: bbd74ac9bd8c6e064d38052647f86f6a9f5c2461
RNReanimated: fe05b2cab00f0e01a5eb7df3383296974faa83fa
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47
Expand Down
6 changes: 3 additions & 3 deletions 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.168",
"version": "0.1.170",
"description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand All @@ -11,11 +11,11 @@
"src",
"lib",
"android",
"ios",
"apple",
"cpp",
"*.podspec",
"react-native.config.js",
"!ios/build",
"!apple/build",
"!android/build",
"!android/gradle",
"!android/gradlew",
Expand Down

0 comments on commit 51eecd5

Please sign in to comment.