Skip to content

Commit

Permalink
Merge pull request #45399 from Expensify/Julesssss-cherry-pick-stagin…
Browse files Browse the repository at this point in the history
…g-45389-1

🍒 Cherry pick PR #45389 to staging 🍒
  • Loading branch information
Julesssss authored Jul 15, 2024
2 parents bb0a66d + 1860fb2 commit f1db12a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 23 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
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
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
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
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

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
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
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

0 comments on commit f1db12a

Please sign in to comment.