From 87f90a101a0c68dce5acfb76e211ab54e979b33c Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 15 Jul 2024 12:58:08 +0000 Subject: [PATCH 1/3] Update version to 9.0.6-6 (cherry picked from commit d0ed04e7c8e7dc935c49aee1e72690ad18c449f6) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fe6ab9ec711e..03a68e635f01 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 636e421ce561..d212f3a4ee92 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.6.5 + 9.0.6.6 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3f7715cc4704..b595119cae95 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.6.5 + 9.0.6.6 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 5d021584c80c..489bd405873f 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.6 CFBundleVersion - 9.0.6.5 + 9.0.6.6 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 73e47aaed6e6..1604d1536964 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.6-5", + "version": "9.0.6-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.6-5", + "version": "9.0.6-6", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index f8720a101476..0494845a6fbc 100644 --- a/package.json +++ b/package.json @@ -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.", From 61c2bb01b6844ed9111c74dbead82facaa0e3e1d Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 15 Jul 2024 13:04:21 +0100 Subject: [PATCH 2/3] Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build [No QA] Fix missing parts of react-native-community/netinfo patch (cherry picked from commit 24c11b4b16432c1c6da02578b158cd2c432f6f34) --- ...mmunity+netinfo+11.2.1+002+turbomodule.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch index f8e171008e14..a9da0ea8ea26 100644 --- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch +++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch @@ -2610,6 +2610,7 @@ 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 +<<<<<<< HEAD index 3c80db2..61e6564 100644 --- a/node_modules/@react-native-community/netinfo/package.json +++ b/node_modules/@react-native-community/netinfo/package.json @@ -2626,6 +2627,15 @@ index 3c80db2..61e6564 100644 "git add" ] + }, +======= +index 3c80db2..15d214d 100644 +--- a/node_modules/@react-native-community/netinfo/package.json ++++ b/node_modules/@react-native-community/netinfo/package.json +@@ -97,6 +97,14 @@ + "webpack-cli": "^3.3.10", + "webpack-dev-server": "^3.11.3" + }, +>>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build) + "codegenConfig": { + "name": "RNCNetInfoSpec", + "type": "modules", @@ -2633,8 +2643,15 @@ index 3c80db2..61e6564 100644 + "android": { + "javaPackageName": "com.reactnativecommunity.netinfo" + } +<<<<<<< HEAD } } +======= ++ }, + "repository": { + "type": "git", + "url": "https://github.com/react-native-netinfo/react-native-netinfo.git" +>>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build) 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 From 1860fb23e10c68f13d22e6df3f7fca7743856c2e Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Mon, 15 Jul 2024 14:13:52 +0100 Subject: [PATCH 3/3] resolve conflicts with newInfo patch --- ...unity+netinfo+11.2.1+002+turbomodule.patch | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch index a9da0ea8ea26..127d455bc068 100644 --- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch +++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch @@ -2610,24 +2610,6 @@ 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 -<<<<<<< HEAD -index 3c80db2..61e6564 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" - }, - "dependencies": {}, -@@ -121,5 +122,13 @@ - "yarn eslint --fix", - "git add" - ] -+ }, -======= index 3c80db2..15d214d 100644 --- a/node_modules/@react-native-community/netinfo/package.json +++ b/node_modules/@react-native-community/netinfo/package.json @@ -2635,7 +2617,6 @@ index 3c80db2..15d214d 100644 "webpack-cli": "^3.3.10", "webpack-dev-server": "^3.11.3" }, ->>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build) + "codegenConfig": { + "name": "RNCNetInfoSpec", + "type": "modules", @@ -2643,15 +2624,10 @@ index 3c80db2..15d214d 100644 + "android": { + "javaPackageName": "com.reactnativecommunity.netinfo" + } -<<<<<<< HEAD - } - } -======= + }, "repository": { "type": "git", "url": "https://github.com/react-native-netinfo/react-native-netinfo.git" ->>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build) 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