Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #45389 to staging 🍒 #45399

Merged
merged 3 commits into from
Jul 15, 2024
Merged

🍒 Cherry pick PR #45389 to staging 🍒 #45399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87f90a1
Update version to 9.0.6-6
OSBotify Jul 15, 2024
61c2bb0
Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch…
Julesssss Jul 15, 2024
1860fb2
resolve conflicts with newInfo patch
Julesssss Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009000605
versionName "9.0.6-5"
versionCode 1009000606
versionName "9.0.6-6"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.6.5</string>
<string>9.0.6.6</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.6.5</string>
<string>9.0.6.6</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.0.6</string>
<key>CFBundleVersion</key>
<string>9.0.6.5</string>
<string>9.0.6.6</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "9.0.6-5",
"version": "9.0.6-6",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
23 changes: 8 additions & 15 deletions patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2610,31 +2610,24 @@ index 6982220..b515270 100644
};
export default _default;
diff --git a/node_modules/@react-native-community/netinfo/package.json b/node_modules/@react-native-community/netinfo/package.json
index 3c80db2..61e6564 100644
index 3c80db2..15d214d 100644
--- a/node_modules/@react-native-community/netinfo/package.json
+++ b/node_modules/@react-native-community/netinfo/package.json
@@ -48,6 +48,7 @@
"network info"
],
"peerDependencies": {
+ "react": "*",
"react-native": ">=0.59"
@@ -97,6 +97,14 @@
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.11.3"
},
"dependencies": {},
@@ -121,5 +122,13 @@
"yarn eslint --fix",
"git add"
]
+ },
+ "codegenConfig": {
+ "name": "RNCNetInfoSpec",
+ "type": "modules",
+ "jsSrcsDir": "src/internal",
+ "android": {
+ "javaPackageName": "com.reactnativecommunity.netinfo"
+ }
}
}
+ },
"repository": {
"type": "git",
"url": "https://github.com/react-native-netinfo/react-native-netinfo.git"
diff --git a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec b/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
index e34e728..9090eb1 100644
--- a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
Expand Down
Loading