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

feat: upgrade native sdk 4.3.1.139.hw #1982

Merged
merged 4 commits into from
Aug 30, 2024
Merged

feat: upgrade native sdk 4.3.1.139.hw #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8489d2
feat: upgrade native sdk 4.3.1.139.hw
littleGnAl Aug 29, 2024
7190474
Bump minimum kotlin version to 1.7.0 (#1944)
littleGnAl Aug 9, 2024
b364601
[example] Remove references to deprecated v1 Android embedding (#1965)
littleGnAl Aug 20, 2024
4ae3113
[example] Fix crash when run on Android 14 (#1967)
littleGnAl Aug 21, 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 android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ dependencies {
api fileTree(dir: "libs", include: ["*.jar"])
} else {
api 'io.agora.rtc:iris-rtc:4.3.1.136-build.1'
api 'io.agora.rtc:agora-special-full:4.3.1.138'
api 'io.agora.rtc:full-screen-sharing:4.3.1.136'
api 'io.agora.rtc:agora-special-full:4.3.1.139.hw'
api 'io.agora.rtc:full-screen-sharing:4.3.1.139.hw'
}
}

Expand Down
3 changes: 3 additions & 0 deletions ci/run_flutter_integration_test_android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ flutter packages get

flutter test integration_test --verbose

# Remove the build directory to save disk space
rm -rf build/

popd

pushd ${MY_PATH}/../test_shard/integration_test_app
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 33
compileSdkVersion 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
3 changes: 3 additions & 0 deletions example/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
package="io.agora.agora_rtc_ng_example">

<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.RECORD_AUDIO" />

<application
android:label="agora_rtc_ng_example"
Expand Down
10 changes: 9 additions & 1 deletion example/android/app/src/main/kotlin/io/agora/agora_rtc_flutter_example/ExampleService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.app.PendingIntent
import android.app.Service
import android.content.Context
import android.content.Intent
import android.content.pm.ServiceInfo
import android.os.Binder
import android.os.Build
import android.os.Bundle
Expand Down Expand Up @@ -89,7 +90,14 @@ class ExampleService: Service() {
.setContentIntent(getContentIntent())
.setShowWhen(false)

startForeground(NOTIFICATION_ID_DAEMON_SERVICE, notificationBuilder.build())
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
startForeground(
NOTIFICATION_ID_DAEMON_SERVICE,
notificationBuilder.build(),
ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE xor ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
} else {
startForeground(NOTIFICATION_ID_DAEMON_SERVICE, notificationBuilder.build())
}
}

private fun getContentIntent(): PendingIntent? {
Expand Down
4 changes: 2 additions & 2 deletions example/android/app/src/main/kotlin/io/agora/agora_rtc_flutter_example/MyApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.agora.agora_rtc_ng_example

import io.flutter.app.FlutterApplication
import android.app.Application
import io.flutter.embedding.engine.FlutterEngine

class MyApplication : FlutterApplication() {
class MyApplication : Application() {
private var flutterEngine: FlutterEngine? = null

fun getFlutterEngine(): FlutterEngine {
Expand Down
4 changes: 2 additions & 2 deletions example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// Min kotlin version for Flutter SDK 3.x
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class _MyAppState extends State<MyApp> {

Future<void> _requestPermissionIfNeed() async {
if (defaultTargetPlatform == TargetPlatform.android) {
await [Permission.microphone, Permission.camera].request();
await [Permission.audio, Permission.microphone, Permission.camera].request();
}
}

Expand Down
10 changes: 5 additions & 5 deletions internal/deps_summary.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ pod 'AgoraIrisRTC_iOS', '4.3.1.136-build.1'
pod 'AgoraIrisRTC_macOS', '4.3.1-build.1'

Native:
https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_rel.v4.3.1.138_63439_FULL_20240806_1530_325691.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_rel.v4.3.1.138_44610_FULL_20240806_1542_325692.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_Android_rel.v4.3.1.139_64151_FULL_20240826_1623_330970.zip
https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_rel.v4.3.1.139_45255_FULL_20240826_1654_330971.zip
<NATIVE_CDN_URL_MACOS>
<NATIVE_CDN_URL_WINDOWS>
implementation 'io.agora.rtc:agora-special-full:4.3.1.138'
implementation 'io.agora.rtc:full-screen-sharing:4.3.1.136'
pod 'AgoraRtcEngine_Special_iOS', '4.3.1.138'
implementation 'io.agora.rtc:agora-special-full:4.3.1.139.hw'
implementation 'io.agora.rtc:full-screen-sharing:4.3.1.139.hw'
pod 'AgoraRtcEngine_Special_iOS', '4.3.1.139.hw'
pod 'AgoraRtcEngine_macOS', '4.3.1'
2 changes: 1 addition & 1 deletion ios/agora_rtc_engine.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Pod::Spec.new do |s|
s.vendored_frameworks = 'libs/*.xcframework'
else
s.dependency 'AgoraIrisRTC_iOS', '4.3.1.136-build.1'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.3.1.138'
s.dependency 'AgoraRtcEngine_Special_iOS', '4.3.1.139.hw'
end

s.platform = :ios, '9.0'
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: agora_rtc_engine
description: >-
Flutter plugin of Agora RTC SDK, allow you to simply integrate Agora Video
Calling or Live Video Streaming to your app with just a few lines of code.
version: 6.3.1-sp.431138
version: 6.3.1-hw.431139
homepage: https://www.agora.io
repository: https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/tree/main
environment:
Expand Down
3 changes: 2 additions & 1 deletion test_shard/fake_test_app/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion test_shard/integration_test_app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 31
compileSdkVersion 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
3 changes: 2 additions & 1 deletion test_shard/integration_test_app/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand Down
5 changes: 3 additions & 2 deletions test_shard/iris_tester/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ group 'com.example.iris_tester'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand All @@ -25,7 +26,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
compileSdkVersion 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
3 changes: 2 additions & 1 deletion test_shard/iris_tester/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand Down
3 changes: 2 additions & 1 deletion test_shard/rendering_test/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
ext.kotlin_version = '1.6.10'
// Min kotlin version for Flutter SDK 3.24
ext.kotlin_version = '1.7.0'
repositories {
google()
mavenCentral()
Expand Down
Loading