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

🚢 Release 2.5X.0 #5010

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

🚢 Release 2.5X.0 #5010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41777cd
Fix audio issues in live sessions
gewfy Mar 8, 2024
91e1bd8
Bump version name
gewfy Mar 8, 2024
734bbca
Fix audio issues in live sessions (#4953)
gewfy Mar 8, 2024
7edbb4a
Merge branch 'main' into release-2.51.0
gewfy Mar 8, 2024
c1eacca
Native Version Bump
gewfy Mar 8, 2024
c2b0da1
Native Version Bump
gewfy Mar 8, 2024
2f3b36d
iOS native version bump on release-2.51.0 (auto generated) (#4957)
gewfy Mar 10, 2024
81c011a
Android native version bump on release-2.51.0 (auto generated) (#4956)
gewfy Mar 10, 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 client/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ android {
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 183
versionName "2.50.0"
versionCode 184
versionName "2.51.0"
}
signingConfigs {
debug {
Expand Down
2 changes: 1 addition & 1 deletion client/ios/Supporting/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>162</string>
<string>163</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
1 change: 1 addition & 0 deletions client/ios/VideoLooperView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ class VideoLooperView: RCTView {
do {
let session = AVAudioSession.sharedInstance()
if (_mixWithOhters) {
try session.setMode(AVAudioSession.Mode.spokenAudio)
try session.setCategory(.playAndRecord, options: [.mixWithOthers, .allowBluetooth, .defaultToSpeaker])
try session.setActive(true)
} else {
Expand Down
24 changes: 12 additions & 12 deletions client/ios/twentyninek.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,15 +1077,15 @@
CODE_SIGN_ENTITLEMENTS = production.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -1111,14 +1111,14 @@
CODE_SIGN_ENTITLEMENTS = production.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -1143,15 +1143,15 @@
CODE_SIGN_ENTITLEMENTS = dev.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -1177,14 +1177,14 @@
CODE_SIGN_ENTITLEMENTS = dev.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -1210,15 +1210,15 @@
CODE_SIGN_ENTITLEMENTS = staging.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
Expand All @@ -1244,14 +1244,14 @@
CODE_SIGN_ENTITLEMENTS = staging.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 162;
CURRENT_PROJECT_VERSION = 163;
DEVELOPMENT_TEAM = 68Y57ZGKLJ;
INFOPLIST_FILE = ./Supporting/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.50.0;
MARKETING_VERSION = 2.51.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
Expand Down
3 changes: 1 addition & 2 deletions client/ios/twentyninek/AppDelegate.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

// allowing sounds from several sources
[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayAndRecord
withOptions:AVAudioSessionCategoryOptionMixWithOthers |
AVAudioSessionCategoryOptionAllowBluetooth
withOptions:AVAudioSessionCategoryOptionMixWithOthers | AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker | AVAudioSessionCategoryOptionInterruptSpokenAudioAndMixWithOthers
error:nil];

self.moduleName = @"twentyninek";
Expand Down
6 changes: 3 additions & 3 deletions client/src/lib/session/components/IntroPortal/IntroPortal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ const IntroPortal: React.FC<IntroPortalProps> = ({
// TODO remove this timeout when daily is not joined
// until after the portal is done
// https://www.notion.so/29k/Early-Access-2794500652b34c64b0aff0dbbc53e0ab?pvs=4#2f566fc8ac87402aa92eb6798b469918
setTimeout(() => {
setIsReadyForAudio(true);
}, 2000);
/*setTimeout(() => {
}, 2000);*/
setIsReadyForAudio(true);
}, [setIsReadyForAudio, setIsLoading]);

const onVideoTransition = useCallback(() => {
Expand Down
Loading