[pull] master from jitsi:master

.github/workflows/ci.yml

@@ -34,9 +34,13 @@ jobs:
     - name: Check if the git repository is clean
       run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
     - run: npm run lint:ci && npm run tsc:ci
-  linux-build:
-    name: Build Frontend (Linux)
-    runs-on: ubuntu-latest
+  frontend:
+    name: Build Frontend
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -49,20 +53,57 @@ jobs:
         npm -v
     - run: npm install
     - run: make
-  macos-ci:
-    name: Build Frontend (macOS)
-    runs-on: macOS-latest
+    - name: Check config.js syntax
+      run: node config.js
+  android-rn-bundle-build:
+    name: Build mobile bundle (Android)
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version-file: '.nvmrc'
         cache: 'npm'
+    - name: Check Node / npm versions
+      run: |
+        node -v
+        npm -v
     - run: npm install
-    - run: make
-  android-build:
-    name: Build mobile bundle (Android)
+    - run: npx react-native bundle --entry-file react/index.native.js --platform android --bundle-output /tmp/android.bundle --reset-cache
+  ios-rn-bundle-build:
+    name: Build mobile bundle (iOS)
+    runs-on: macos-15
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'npm'
+    - name: Check Node / npm versions
+      run: |
+        node -v
+        npm -v
+    - run: npm install
+    - name: setup Xcode
+      run: |
+        uname -a
+        xcode-select -p
+        sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
+        xcodebuild -version
+    - name: setup-cocoapods
+      uses: maxim-lobanov/setup-cocoapods@v1
+      with:
+        podfile-path: ios/Podfile.lock
+    - name: Install Pods
+      run: |
+        pod --version
+        cd ios
+        pod install --repo-update --deployment
+    - run: npx react-native bundle --entry-file react/index.native.js --platform ios --bundle-output /tmp/ios.bundle --reset-cache
+  android-sdk-build:
+    name: Build mobile SDK (Android)
     runs-on: ubuntu-latest
+    container: reactnativecommunity/react-native-android:v13.0
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -74,14 +115,13 @@ jobs:
         node -v
         npm -v
     - run: npm install
-    - run: npx react-native bundle --entry-file react/index.native.js --platform android --bundle-output /tmp/android.bundle --reset-cache
-  ios-build:
-    name: Build mobile bundle (iOS)
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-13, macos-14]
+    - run: |
+        cd android
+        ./gradlew :sdk:clean
+        ./gradlew :sdk:assembleRelease
+  ios-sdk-build:
+    name: Build mobile SDK (iOS)
+    runs-on: macos-15
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -97,7 +137,7 @@ jobs:
       run: |
         uname -a
         xcode-select -p
-        sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
+        sudo xcode-select -s /Applications/Xcode_16.0.app/Contents/Developer
         xcodebuild -version
     - name: setup-cocoapods
       uses: maxim-lobanov/setup-cocoapods@v1
@@ -107,10 +147,24 @@ jobs:
       run: |
         pod --version
         cd ios
-        pod install --repo-update
-    - name: Check if the git repository is clean
-      run: $(exit $(git status --porcelain --untracked-files=no | head -255 | wc -l)) || (echo "Dirty git tree"; git diff; exit 1)
-    - run: npx react-native bundle --entry-file react/index.native.js --platform ios --bundle-output /tmp/ios.bundle --reset-cache
+        pod install --repo-update --deployment
+    - run: |
+        xcodebuild clean \
+          -workspace ios/jitsi-meet.xcworkspace \
+          -scheme JitsiMeetSDK
+        xcodebuild archive \
+          -workspace ios/jitsi-meet.xcworkspace \
+          -scheme JitsiMeetSDK  \
+          -configuration Release \
+          -sdk iphoneos \
+          -destination='generic/platform=iOS' \
+          -archivePath ios/sdk/out/ios-device \
+          SKIP_INSTALL=NO \
+          BUILD_LIBRARY_FOR_DISTRIBUTION=YES
+        xcodebuild -create-xcframework \
+          -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \
+          -output ios/sdk/out/JitsiMeetSDK.xcframework
+    - run: ls -lR ios/sdk/out
   debian-build:
     name: Test Debian packages build
     runs-on: ubuntu-latest

.gitignore

@@ -38,6 +38,7 @@ DerivedData
 *.dSYM.zip
 *.xcuserstate
 project.xcworkspace
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -100,6 +101,9 @@ tsconfig.json
 react-native-sdk/*.tgz
 react-native-sdk/android/src
 !react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetReactNativePackage.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JitsiMeetOngoingConferenceService.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/JMOngoingConferenceModule.java
+!react-native-sdk/android/src/main/java/org/jitsi/meet/sdk/RNOngoingNotification.java
 react-native-sdk/images
 react-native-sdk/ios
 react-native-sdk/lang
@@ -108,3 +112,8 @@ react-native-sdk/node_modules
 react-native-sdk/react
 react-native-sdk/service
 react-native-sdk/sounds
+
+# tests
+tests/.env
+test-results
+

.nvmrc

@@ -1 +1 @@
-20
+22

README.md

@@ -34,7 +34,7 @@ mobile apps:
 
 | Android | Android (F-Droid) | iOS |
 |:-:|:-:|:-:|
-| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/en/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
+| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
 
 If you are feeling adventurous and want to get an early scoop of the features as they are being
 developed you can also sign up for our open beta testing here:

SECURITY.md

@@ -4,6 +4,6 @@
 
 We take security very seriously and develop all Jitsi projects to be secure and safe.
 
-If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8) or send us an email to [email protected]. 
+If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8-bounty) or send us an email to [email protected]. 
 
 **We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**

android/app/build.gradle

@@ -15,12 +15,6 @@ def vcode = (int) (((new Date().getTime() / 1000) - 1546297200) / 10)
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-    packagingOptions {
-        jniLibs {
-            excludes += ['lib/*/libhermes*.so']
-        }
-    }
-
 
     defaultConfig {
         applicationId 'org.jitsi.meet'

android/build.gradle

@@ -17,15 +17,13 @@ buildscript {
 }
 
 ext {
-    kotlinVersion = "1.7.0"
-    buildToolsVersion = "33.0.2"
+    kotlinVersion = "1.9.24"
+    buildToolsVersion = "34.0.0"
     compileSdkVersion = 34
-    minSdkVersion    = 24
+    minSdkVersion    = 26
     targetSdkVersion = 34
     supportLibVersion = "28.0.0"
-
-    // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-    ndkVersion = "23.1.7779620"
+    ndkVersion = "26.1.10909125"
 
     // The Maven artifact groupId of the third-party react-native modules which
     // Jitsi Meet SDK for Android depends on and which are not available in
@@ -43,14 +41,12 @@ ext {
 
     googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
 
-    //React Native Version
-    rnVersion = "0.73.8"
+    //React Native and Hermes Version
+    rnVersion = "0.75.4"
 }
 
 allprojects {
     repositories {
-        // Android JSC is installed from npm.
-        maven { url("$rootDir/../node_modules/jsc-android/dist") }
         mavenCentral()
         google()
         maven { url 'https://www.jitpack.io' }

android/gradle.properties

@@ -27,4 +27,4 @@ android.enableJetifier=true
 android.bundle.enableUncompressedNativeLibs=false
 
 appVersion=99.0.0
-sdkVersion=99.0.0
+sdkVersion=0.0.0

android/scripts/release-sdk.sh

@@ -9,7 +9,6 @@ THE_MVN_REPO=${MVN_REPO:-${1:-$DEFAULT_MVN_REPO}}
 MVN_HTTP=0
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
-JSC_VERSION="r"$(jq -r '.dependencies."jsc-android"' ${THIS_DIR}/../../node_modules/react-native/package.json | cut -d . -f 1 | cut -c 2-)
 
 if [[ $THE_MVN_REPO == http* ]]; then
     MVN_HTTP=1
@@ -23,34 +22,7 @@ export MVN_REPO=$THE_MVN_REPO
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
 echo "Using ${MVN_REPO} as the Maven repo"
 
- if [[ $MVN_HTTP == 1 ]]; then
-    # Push JSC
-    echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
-    pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
-    mvn \
-        deploy:deploy-file \
-        -Durl=${MVN_REPO} \
-        -DrepositoryId=${MVN_REPO_ID} \
-        -Dfile=android-jsc-${JSC_VERSION}.aar \
-        -Dpackaging=aar \
-        -DgeneratePom=false \
-        -DpomFile=android-jsc-${JSC_VERSION}.pom || true
-    popd
-else
-    # Push JSC, if necessary
-    if [[ ! -d ${MVN_REPO}/org/webkit/android-jsc/${JSC_VERSION} ]]; then
-        echo "Pushing JSC ${JSC_VERSION} to the Maven repo"
-        pushd ${THIS_DIR}/../../node_modules/jsc-android/dist/org/webkit/android-jsc/${JSC_VERSION}
-        mvn \
-            deploy:deploy-file \
-            -Durl=${MVN_REPO} \
-            -Dfile=android-jsc-${JSC_VERSION}.aar \
-            -Dpackaging=aar \
-            -DgeneratePom=false \
-            -DpomFile=android-jsc-${JSC_VERSION}.pom
-        popd
-    fi
-
+ if [[ $MVN_HTTP == 0 ]]; then
     # Check if an SDK with that same version has already been released
     if [[ -d ${MVN_REPO}/org/jitsi/react/jitsi-meet-sdk/${SDK_VERSION} ]]; then
         echo "There is already a release with that version in the Maven repo!"

android/sdk/build.gradle

@@ -8,6 +8,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        buildConfigField "String", "SDK_VERSION", "\"$sdkVersion\""
     }
 
     buildTypes {
@@ -41,6 +42,7 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     api "com.facebook.react:react-android:$rootProject.ext.rnVersion"
+    api "com.facebook.react:hermes-android:$rootProject.ext.rnVersion"
 
     //noinspection GradleDynamicVersion
     implementation 'org.webkit:android-jsc:+'
@@ -56,7 +58,7 @@ dependencies {
     if (!rootProject.ext.libreBuild) {
         implementation project(':react-native-amplitude')
         implementation project(':react-native-giphy')
-        implementation(project(":react-native-google-signin")) {
+        implementation(project(':react-native-google-signin')) {
             exclude group: 'com.google.android.gms'
             exclude group: 'androidx'
         }
@@ -138,8 +140,7 @@ android.libraryVariants.all { def variant ->
         // Run the bundler
         commandLine(
                 "node",
-                "node_modules/react-native/local-cli/cli.js",
-                "bundle",
+                "node_modules/react-native/scripts/bundle.js",
                 "--platform", "android",
                 "--dev", "${devEnabled}",
                 "--reset-cache",

android/sdk/src/main/java/org/jitsi/meet/sdk/AppInfoModule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright @ 2017-present Atlassian Pty Ltd
+ * Copyright @ 2017-present 8x8, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ class AppInfoModule
     public static final String NAME = "AppInfo";
     public static final boolean GOOGLE_SERVICES_ENABLED = getGoogleServicesEnabled();
     public static final boolean LIBRE_BUILD = getLibreBuild();
+    public static final String SDK_VERSION = getSdkVersion();
 
     public AppInfoModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -79,6 +80,7 @@ public Map<String, Object> getConstants() {
         constants.put(
             "version",
             packageInfo == null ? "" : packageInfo.versionName);
+        constants.put("sdkVersion", SDK_VERSION);
         constants.put("LIBRE_BUILD", LIBRE_BUILD);
         constants.put("GOOGLE_SERVICES_ENABLED", GOOGLE_SERVICES_ENABLED);
 
@@ -116,6 +118,19 @@ private static boolean getLibreBuild() {
         return false;
     }
 
+    /**
+     * Gets the SDK version.
+     */
+    private static String getSdkVersion() {
+        Object sdkVersion = getBuildConfigValue("SDK_VERSION");
+
+        if (sdkVersion !=null) {
+            return (String) sdkVersion;
+        }
+
+        return "";
+    }
+
     /**
      * Gets build config value of a certain field.
      *

android/sdk/src/main/java/org/jitsi/meet/sdk/AudioDeviceHandlerConnectionService.java

@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.media.AudioManager;
-import android.os.Build;
 import android.telecom.CallAudioState;
 import androidx.annotation.RequiresApi;
 
@@ -34,7 +33,6 @@
  * {@link AudioModeModule.AudioDeviceHandlerInterface} module implementing device handling for
  * Android versions >= O when ConnectionService is enabled.
  */
-@RequiresApi(Build.VERSION_CODES.O)
 class AudioDeviceHandlerConnectionService implements
         AudioModeModule.AudioDeviceHandlerInterface,
         RNConnectionService.CallAudioStateListener {