Skip to content

Commit 0cf3443

Browse files
committed
Merge remote-tracking branch 'origin/main' into develop
# Conflicts: # projects/SlackClone/android/build.gradle # projects/SlackClone/ios/Podfile.lock # projects/SlackClone/package.json # projects/SlackClone/yarn.lock # projects/iMessageClone/fastlane/Fastfile # projects/iMessageClone/ios/Podfile.lock # projects/iMessageClone/ios/iMessageCloneReactNative/Info.plist # projects/iMessageClone/package.json # projects/iMessageClone/yarn.lock
2 parents 1e1c008 + 5c659d7 commit 0cf3443

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

projects/SlackClone/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ allprojects {
4848
google()
4949
maven { url 'https://www.jitpack.io' }
5050
}
51-
}
51+
}

projects/SlackClone/fastlane/Fastfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ platform :ios do
8282

8383
testflight_groups = (git_branch() == "main") ? ['Dev Testers', 'Public Testers'] : ['Dev Testers']
8484

85+
# https://github.com/fastlane/fastlane/issues/20741
86+
ENV['ITMSTRANSPORTER_FORCE_ITMS_PACKAGE_UPLOAD'] = 'true'
87+
8588
begin
8689
upload_to_testflight(
8790
groups: testflight_groups,

projects/WhatsAppClone/fastlane/Fastfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ platform :ios do
8484

8585
testflight_groups = (git_branch() == "main") ? ['Dev Testers', 'Public Testers'] : ['Dev Testers']
8686

87+
# https://github.com/fastlane/fastlane/issues/20741
88+
ENV['ITMSTRANSPORTER_FORCE_ITMS_PACKAGE_UPLOAD'] = 'true'
89+
8790
begin
8891
upload_to_testflight(
8992
groups: testflight_groups,

projects/iMessageClone/ios/iMessageCloneReactNative/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@
5858
<key>ITSAppUsesNonExemptEncryption</key>
5959
<false />
6060
</dict>
61-
</plist>
61+
</plist>

projects/iMessageClone/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,10 +1095,10 @@
10951095
"@jridgewell/resolve-uri" "^3.0.3"
10961096
"@jridgewell/sourcemap-codec" "^1.4.10"
10971097

1098-
"@react-native-camera-roll/[email protected].0":
1099-
version "5.0.0"
1100-
resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.0.0.tgz#86564e335df5fc1e765a025f369c653283bd54ab"
1101-
integrity sha512-H7xfQnzNUnJ/TN+cqtepJ3A6CP4c1zaRKYkoL/DGISzcZFCLwrRcOnrgZLyeJwQhfXwgcoZMFlUtfUDiKO9YMg==
1098+
"@react-native-camera-roll/camera-roll@~5.0.4":
1099+
version "5.0.4"
1100+
resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.0.4.tgz#341b8275363ee496b796fa58cb592697798d39e5"
1101+
integrity sha512-3kBRgW3VfmLQmQm70gPUVDu8rPSZymoPc9vmeiPLMKBqtWaqPNuPX0jQ6mZ8AEtYbBdoWC360Q4YYPalXv37zA==
11021102

11031103
"@react-native-community/cli-clean@^9.2.1":
11041104
version "9.2.1"

0 commit comments

Comments
 (0)