agora-appbuilder-core 4.1.29 → 4.1.30-beta.2

package/template/android/app/build.gradle

@@ -1,11 +1,21 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
 
+dependencies {
+    // Declare before autolinking: pickFirst must select this shared AOSL version,
+    // rather than the older copy bundled in RTM. RTC and Chat need its new symbols.
+    // https://doc.shengwang.cn/faq/integration-issues/rtm2-rtc-integration-issue
+    implementation("io.agora.infra:aosl:1.3.5")
+}
+
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
 react {
+    autolinkLibrariesWithApp()
+    // Bound Metro's memory use while Gradle compiles native modules in parallel.
+    extraPackagerArgs = ["--max-workers", "4"]
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
     // root = file("../")
@@ -68,6 +78,18 @@ def enableProguardInReleaseBuilds = false
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
 
+// Supply these through ~/.gradle/gradle.properties or environment variables.
+def uploadSigning = [
+    storeFile: providers.gradleProperty('APPBUILDER_UPLOAD_STORE_FILE').orElse(providers.environmentVariable('APPBUILDER_UPLOAD_STORE_FILE')).orNull,
+    storePassword: providers.gradleProperty('APPBUILDER_UPLOAD_STORE_PASSWORD').orElse(providers.environmentVariable('APPBUILDER_UPLOAD_STORE_PASSWORD')).orNull,
+    keyAlias: providers.gradleProperty('APPBUILDER_UPLOAD_KEY_ALIAS').orElse(providers.environmentVariable('APPBUILDER_UPLOAD_KEY_ALIAS')).orNull,
+    keyPassword: providers.gradleProperty('APPBUILDER_UPLOAD_KEY_PASSWORD').orElse(providers.environmentVariable('APPBUILDER_UPLOAD_KEY_PASSWORD')).orNull,
+]
+def hasUploadSigning = uploadSigning.values().every { it != null && !it.isEmpty() }
+if (uploadSigning.values().any { it != null } && !hasUploadSigning) {
+    throw new GradleException('Set all four APPBUILDER_UPLOAD_* signing properties to sign a Play release.')
+}
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -88,25 +110,29 @@ android {
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
+        if (hasUploadSigning) {
+            release {
+                storeFile file(uploadSigning.storeFile)
+                storePassword uploadSigning.storePassword
+                keyAlias uploadSigning.keyAlias
+                keyPassword uploadSigning.keyPassword
+            }
+        }
     }
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
         }
         release {
-            // Caution! In production, you need to generate your own keystore file.
-            // see https://reactnative.dev/docs/signed-apk-android.
-            signingConfig signingConfigs.debug
+            // Without an upload key, release artifacts are signed for local QA only.
+            signingConfig hasUploadSigning ? signingConfigs.release : signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
     
     packagingOptions {
-        pickFirst '**/lib/arm64-v8a/libaosl.so'
-        pickFirst '**/lib/armeabi-v7a/libaosl.so'
-        pickFirst '**/lib/x86/libaosl.so'
-        pickFirst '**/lib/x86_64/libaosl.so'
+        pickFirst 'lib/**/libaosl.so'
     }
 }
 
@@ -114,25 +140,9 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }
 }
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

package/template/android/app/src/main/AndroidManifest.xml

@@ -1,10 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme">
+	<application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:enableOnBackInvokedCallback="false">
 		<activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:screenOrientation="portrait" android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -15,7 +17,7 @@
 		<meta-data android:name="com.supersami.foregroundservice.notification_channel_name" android:value="AppBuilder"/>
 		<meta-data android:name="com.supersami.foregroundservice.notification_channel_description" android:value="AppBuilder is running"/>
 		<meta-data android:name="com.supersami.foregroundservice.notification_color" android:resource="@color/blue"/>
-		<service android:name="com.supersami.foregroundservice.ForegroundService" />
+		<service android:name="com.supersami.foregroundservice.ForegroundService" android:foregroundServiceType="microphone|mediaPlayback" />
 		<service android:name="com.supersami.foregroundservice.ForegroundServiceTask" />
 	</application>
-</manifest>
+</manifest>

package/template/android/app/src/main/java/com/helloworld/MainApplication.java

@@ -3,11 +3,15 @@ package com.helloworld;
 import android.app.Application;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactHost;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
+import com.facebook.react.defaults.DefaultReactHost;
+import com.facebook.react.soloader.OpenSourceMergedSoMapping;
 import com.facebook.soloader.SoLoader;
+import java.io.IOException;
 import java.util.List;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 
@@ -51,15 +55,23 @@ public class MainApplication extends Application implements ReactApplication {
     return mReactNativeHost;
   }
 
+  @Override
+  public ReactHost getReactHost() {
+    return DefaultReactHost.getDefaultReactHost(getApplicationContext(), mReactNativeHost);
+  }
+
   @Override
   public void onCreate() {
     super.onCreate();
-    SoLoader.init(this, /* native exopackage */ false);
+    try {
+      SoLoader.init(this, OpenSourceMergedSoMapping.INSTANCE);
+    } catch (IOException error) {
+      throw new RuntimeException("Unable to initialize React Native libraries", error);
+    }
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       DefaultNewArchitectureEntryPoint.load();
     }
-    ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
     SSLPinningFactory sslPinningFactory = new SSLPinningFactory(getApplicationContext());
     OkHttpClientProvider.setOkHttpClientFactory(sslPinningFactory);
   }  

package/template/android/build.gradle

@@ -2,23 +2,48 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "35.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 34
-        targetSdkVersion = 34
+        compileSdkVersion = 36
+        targetSdkVersion = 36
 
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
-        kotlinVersion = "1.8.21" // added this for datadog logs - https://docs.datadoghq.com/real_user_monitoring/mobile_and_tv_monitoring/setup/reactnative/#setup
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
         androidXAnnotation = "1.2.0"
         androidXBrowser = "1.3.0"
     }
     subprojects { subproject ->
+        // Older native modules declare obsolete AGP versions in their own builds.
+        subproject.buildscript.repositories {
+            google()
+            mavenCentral()
+        }
+        subproject.buildscript.configurations.configureEach {
+            resolutionStrategy.force 'com.android.tools.build:gradle:8.10.1'
+        }
+        subproject.plugins.withId('com.android.library') {
+            subproject.android.ndkVersion = rootProject.ext.ndkVersion
+            subproject.android.buildFeatures.buildConfig = true
+            // NDK 27 needs this flag when compiling native libraries for 16 KB devices.
+            subproject.android.defaultConfig.externalNativeBuild.cmake.arguments.add('-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON')
+            // AGP 8 requires a namespace; legacy modules still put it in the manifest.
+            if (subproject.android.namespace == null) {
+                def manifest = subproject.file('src/main/AndroidManifest.xml')
+                if (manifest.exists()) {
+                    def packageName = (manifest.text =~ /package\s*=\s*["']([^"']+)["']/)
+                    if (packageName.find()) {
+                        subproject.android.namespace = packageName.group(1)
+                    }
+                }
+            }
+        }
         afterEvaluate{
             if((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
                 android {
                     compileSdkVersion rootProject.ext.compileSdkVersion
                     buildToolsVersion rootProject.ext.buildToolsVersion
+                    ndkVersion rootProject.ext.ndkVersion
+                    externalNativeBuild.cmake.version = '3.22.1'
                 }
             }
         }
@@ -28,9 +53,19 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle")
+        classpath("com.android.tools.build:gradle:8.10.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
+apply plugin: "com.facebook.react.rootproject"
 
+allprojects {
+    repositories {
+        maven {
+            url 'https://download.agora.io/maven/'
+            content { includeGroupByRegex 'io\\.agora\\.rtc.*' }
+        }
+    }
+}

package/template/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=60000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

package/template/android/gradle.properties

@@ -24,9 +24,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-# Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.182.0
-
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64

package/template/android/settings.gradle

@@ -1,4 +1,6 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension) { ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'HelloWorld'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/@react-native/gradle-plugin')
+includeBuild('../node_modules/@react-native/gradle-plugin')

package/template/babel.config.js

@@ -14,7 +14,7 @@ const { getCustomizationApiPath } =  require('./customization.config');
 
 // This file is read only by react native for IOS & Android. Doesn't apply to electron, Web targets
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: [
     ['transform-define', configVars],
     [

package/template/defaultConfig.js

@@ -77,8 +77,8 @@ const DefaultConfig = {
   CHAT_ORG_NAME: "",
   CHAT_APP_NAME: "",
   CHAT_URL: "",
-  CLI_VERSION: "3.1.29",
-  CORE_VERSION: "4.1.29",
+  CLI_VERSION: "3.1.30-beta.2",
+  CORE_VERSION: "4.1.30-beta.2",
   DISABLE_LANDSCAPE_MODE: false,
   STT_AUTO_START: false,
   CLOUD_RECORDING_AUTO_START: false,

package/template/ios/HelloWorld.xcodeproj/project.pbxproj

@@ -942,7 +942,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = HelloWorldTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -963,7 +963,7 @@
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = HelloWorldTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -989,7 +989,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = HelloWorld/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1003,6 +1003,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "HelloWorld-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -1019,7 +1020,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = HelloWorld/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -1032,6 +1033,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "HelloWorld-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
@@ -1256,7 +1258,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SDKROOT)/usr/lib/swift",
@@ -1313,7 +1315,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SDKROOT)/usr/lib/swift",

package/template/ios/Podfile

@@ -12,42 +12,12 @@ class Pod::Installer::Xcode::TargetValidator
   end
 end
 
+# Keep the legacy architecture used by the app and its Android configuration.
+ENV['RCT_NEW_ARCH_ENABLED'] ||= '0'
+
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
-# ======================================
-#  BOOST PODSPEC CHECKSUM FIX
-# This ensures all developers use the patched Boost source URL:
-# https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.bz2
-# ======================================
-require 'fileutils'
-
-boost_src = File.join(__dir__, 'podspec-patches', 'boost.podspec')
-boost_dst = File.join(__dir__, '..', 'node_modules', 'react-native',
-  'third-party-podspecs', 'boost.podspec')
-
-if File.exist?(boost_src)
-  puts "➡️ Applying patched Boost podspec (checksum fix)"
-  FileUtils.cp(boost_src, boost_dst)
-else
-  puts "⚠️ No patched Boost podspec found at #{boost_src}"
-end
-# ======================================
-#  BOOST PODSPEC CHECKSUM FIX
-# ======================================
-
-
-# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
-# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
-#
-# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
-# ```js
-# module.exports = {
-#   dependencies: {
-#     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
-# ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
-
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -58,19 +28,8 @@ target 'HelloWorld' do
   config = use_native_modules!
   pod 'TrustKit'
 
-  # Flags change depending on the env values.
-  flags = get_default_flags()
-
   use_react_native!(
     :path => config[:reactNativePath],
-    # Hermes is now enabled by default. Disable by setting this flag to false.
-    :hermes_enabled => flags[:hermes_enabled],
-    :fabric_enabled => flags[:fabric_enabled],
-    # Enables Flipper.
-    #
-    # Note that if you have use_frameworks! enabled, Flipper will not work and
-    # you should disable the next line.
-    :flipper_configuration => flipper_config,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -87,7 +46,6 @@ target 'HelloWorld' do
       config[:reactNativePath],
       :mac_catalyst_enabled => false
     )
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
 
     # === BEGIN: Bitcode Stripping ===
     bitcode_strip_path = `xcrun --find bitcode_strip`.chomp