Skip to content

Commit 40de597

Browse files
vdovbnya-qbvdovbnya-qb
committed
1.1.0-videochat-flutter
1 parent fb067b0 commit 40de597

File tree

18 files changed

+178
-161
lines changed

18 files changed

+178
-161
lines changed

‎videocall_webrtc_sample/android/app/build.gradle‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,8 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
compileSdkVersion 34
27-
ndkVersion flutter.ndkVersion
28-
29-
compileOptions {
30-
sourceCompatibility JavaVersion.VERSION_1_8
31-
targetCompatibility JavaVersion.VERSION_1_8
32-
}
33-
34-
kotlinOptions {
35-
jvmTarget = '1.8'
36-
}
26+
namespace 'com.quickblox.videocall_webrtc_sample'
27+
compileSdk 34
3728

3829
sourceSets {
3930
main.java.srcDirs += 'src/main/kotlin'
@@ -42,10 +33,8 @@ android {
4233
defaultConfig {
4334
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4435
applicationId "com.quickblox.videocall_webrtc_sample"
45-
// You can update the following values to match your application needs.
46-
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
47-
minSdkVersion 26
48-
targetSdkVersion 34
36+
minSdk 26
37+
targetSdk 34
4938
versionCode flutterVersionCode.toInteger()
5039
versionName flutterVersionName
5140
}
@@ -66,6 +55,19 @@ android {
6655
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
6756
}
6857
}
58+
59+
compileOptions {
60+
sourceCompatibility = JavaVersion.VERSION_17
61+
targetCompatibility = JavaVersion.VERSION_17
62+
}
63+
64+
kotlinOptions {
65+
jvmTarget = '17'
66+
}
67+
68+
lint {
69+
disable 'InvalidPackage'
70+
}
6971
}
7072

7173
flutter {

‎videocall_webrtc_sample/android/app/proguard-rules.pro‎

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,53 @@
11
# Add project specific ProGuard rules here.
2-
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
2+
# By default, the flags in this file are appended to flags specified
3+
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
46
#
57
# For more details, see
6-
# http://developer.android.com/guide/developing/tools/proguard.html
8+
# http://developer.android.com/guide/developing/tools/proguard.html
79

810
# If your project uses WebView with JS, uncomment the following
911
# and specify the fully qualified class name to the JavaScript interface
1012
# class:
1113
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1214
# public *;
1315
#}
16+
#-dontusemixedcaseclassnames
17+
#-dontskipnonpubliclibraryclasses
18+
#-verbose
19+
#
1420

15-
# Uncomment this to preserve the line number information for
16-
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
18-
19-
# If you keep the line number information, uncomment this to
20-
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
##---------------Begin: proguard configuration for Gson ----------
22+
# Gson uses generic type information stored in a class file when working with fields. Proguard
23+
# removes such information by default, so configure it to keep all of it.
24+
-keepattributes EnclosingMethod
25+
-keepattributes InnerClasses
2226
-keepattributes Signature
27+
-keepattributes Exceptions
2328

2429
# For using GSON @Expose annotation
2530
-keepattributes *Annotation*
2631

27-
# Gson specific classes
28-
-keep class sun.misc.Unsafe { *; }
29-
#-keep class com.google.gson.stream.** { *; }
30-
31-
# Application classes that will be serialized/deserialized over Gson
32-
-keep class com.quickblox.core.account.model.** { *; }
33-
34-
-keep class com.quickblox.auth.parsers.** { *; }
35-
-keep class com.quickblox.auth.model.** { *; }
36-
-keep class com.quickblox.core.parser.** { *; }
37-
-keep class com.quickblox.core.model.** { *; }
38-
-keep class com.quickblox.core.server.** { *; }
39-
-keep class com.quickblox.core.rest.** { *; }
40-
-keep class com.quickblox.core.error.** { *; }
41-
-keep class com.quickblox.core.Query { *; }
42-
43-
-keep class com.quickblox.content.model.** { *; }
32+
#quickblox sdk
33+
-keep class com.quickblox.** { *; }
4434

45-
-keep class com.quickblox.users.parsers.** { *; }
46-
-keep class com.quickblox.users.model.** { *; }
47-
48-
-keep class com.quickblox.messages.parsers.** { *; }
49-
-keep class com.quickblox.messages.QBPushNotifications { *; }
50-
-keep class com.quickblox.messages.model.** { *; }
51-
-keep class com.quickblox.messages.services.** { *; }
35+
#smack xmpp library
36+
-keep class org.jxmpp.** { *; }
37+
-keep class org.jivesoftware.** { *; }
38+
-dontwarn org.jivesoftware.**
5239

53-
-keep class com.quickblox.chat.parser.** { *; }
54-
-keep class com.quickblox.chat.model.** { *; }
40+
-keep class org.xmlpull.** { *; }
41+
-dontwarn org.xmlpull.v1.**
5542

56-
-keep class org.jivesoftware.** { *; }
57-
-keep class org.jxmpp.** { *; }
43+
#webrtc
5844
-keep class org.webrtc.** { *; }
59-
-keep class com.quickblox.conference.** { *; }
6045

61-
-keep class com.bumptech.** { *; }
46+
#google gms
47+
-keep class com.google.android.gms.** { *; }
48+
49+
#json
50+
-keep class org.json.** { *; }
6251

63-
-dontwarn org.jivesoftware.smackx.**
52+
#flutter file picker library
53+
-keep class androidx.lifecycle.DefaultLifecycleObserver

‎videocall_webrtc_sample/android/app/src/debug/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.quickblox.videocall_webrtc_sample">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

‎videocall_webrtc_sample/android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.quickblox.videocall_webrtc_sample">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!--//TODO: need to delete permissions, should be in SDK after update-->
43
<uses-permission android:name="android.permission.RECORD_AUDIO" />
54
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />

‎videocall_webrtc_sample/android/app/src/profile/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.quickblox.videocall_webrtc_sample">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

‎videocall_webrtc_sample/android/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

‎videocall_webrtc_sample/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
4-
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
5+
zipStorePath=wrapper/dists

‎videocall_webrtc_sample/android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919

2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22-
id "com.android.application" version "7.4.2" apply false
22+
id "com.android.application" version "8.2.2" apply false
2323
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
2424
}
2525

‎videocall_webrtc_sample/ios/Podfile.lock‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ PODS:
77
- FlutterMacOS
88
- permission_handler_apple (9.1.1):
99
- Flutter
10-
- QuickBlox (2.19.0)
11-
- Quickblox-WebRTC (2.8.1):
12-
- QuickBlox (>= 2.7)
13-
- quickblox_sdk (0.14.2):
10+
- QBGoogleWebRTC (124.0.2)
11+
- QuickBlox (2.20.0)
12+
- Quickblox-WebRTC (3.1.0):
13+
- QBGoogleWebRTC (>= 124.0)
14+
- QuickBlox (>= 2.20)
15+
- quickblox_sdk (0.16.2):
1416
- Flutter
15-
- QuickBlox (~> 2.18)
16-
- Quickblox-WebRTC (~> 2.7)
17+
- QuickBlox (~> 2.20)
18+
- Quickblox-WebRTC (~> 3.1)
1719

1820
DEPENDENCIES:
1921
- audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
@@ -24,6 +26,7 @@ DEPENDENCIES:
2426

2527
SPEC REPOS:
2628
trunk:
29+
- QBGoogleWebRTC
2730
- QuickBlox
2831
- Quickblox-WebRTC
2932

@@ -44,9 +47,10 @@ SPEC CHECKSUMS:
4447
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
4548
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
4649
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
47-
QuickBlox: 3dba480339b42e77f9450773aaf4c3885463da3f
48-
Quickblox-WebRTC: 10bb490c8f5ffe730a00b62549f059b386e99d8c
49-
quickblox_sdk: 823736a1efcc32164069c21502ced09e48e1ff32
50+
QBGoogleWebRTC: 1391bfd075620e01512d2c334c7463c03f14467f
51+
QuickBlox: e3ba718b7a195a6569c3e0eb33918d9ee1014f66
52+
Quickblox-WebRTC: f9c4f73be00b207e88fdfc6f2b592f1deb669aec
53+
quickblox_sdk: d71a4523df7358b7837eac82f04f4c47294762dc
5054

5155
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
5256

0 commit comments

Comments
 (0)