Skip to content

Commit 25dbfa0

Browse files
vdovbnya-qbvdovbnya-qb
committed
4.4.1-conference-java
1 parent e9a5a90 commit 25dbfa0

File tree

12 files changed

+121
-310
lines changed

12 files changed

+121
-310
lines changed

Diff for: ‎sample-conference-java/app/build.gradle

+15-24
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
5-
maven { url 'https://maven.fabric.io/public' }
6-
}
7-
8-
dependencies {
9-
classpath "io.fabric.tools:gradle:$fabricToolsVersion"
4+
mavenCentral()
105
}
116
}
127

138
apply plugin: 'com.android.application'
14-
apply plugin: 'io.fabric'
159

1610
repositories {
1711
google()
18-
jcenter()
12+
mavenCentral()
1913
maven {
2014
url "https://github.com/QuickBlox/quickblox-android-sdk-releases/raw/master/"
2115
}
22-
maven { url 'https://maven.fabric.io/public' }
23-
flatDir { dirs 'libs' }
2416
}
2517

2618
android {
2719
def versionQACode = 1
2820

29-
compileSdkVersion 29
30-
buildToolsVersion "29.0.3"
21+
compileSdkVersion 31
22+
buildToolsVersion "31.0.0"
3123
flavorDimensions dimensionDefault
3224

3325
defaultConfig {
3426
applicationId "com.quickblox.sample.videochat.conference.java"
35-
minSdkVersion 16
36-
targetSdkVersion 29
37-
versionCode 440000
38-
versionName '4.4.0'
27+
minSdkVersion 21
28+
targetSdkVersion 31
29+
versionCode 441000
30+
versionName '4.4.1'
3931
multiDexEnabled true
4032
}
4133

@@ -59,12 +51,14 @@ android {
5951
minifyEnabled false
6052
shrinkResources false
6153
proguardFile 'proguard-rules.pro'
62-
zipAlignEnabled false
6354
resValue "string", "versionName", "QuickBlox Video Chat Conference Java\nBuild version " + defaultConfig.getVersionName()
6455
}
6556

6657
release {
6758
signingConfig signingConfigs.debug
59+
minifyEnabled true
60+
shrinkResources true
61+
proguardFile 'proguard-rules.pro'
6862
resValue "string", "versionName", "QuickBlox Video Chat Conference Java\nBuild version " + defaultConfig.getVersionName()
6963
}
7064
}
@@ -100,18 +94,15 @@ dependencies {
10094
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycleViewmodelAndroidXVersion"
10195
implementation "androidx.core:core-ktx:$rootProject.coreKtxVersion"
10296

103-
implementation("com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion@aar") {
104-
transitive = true
105-
}
106-
10797
implementation "com.timehop.stickyheadersrecyclerview:library:$rootProject.stickylistheadersVersion@aar"
10898
implementation "com.github.orangegangsters:swipy:$rootProject.swipyVersion@aar"
10999
implementation "com.github.johnkil.android-robototextview:robototextview:$robotoTextViewVersion"
110-
implementation "com.github.bumptech.glide:glide:$glideVersion"
111100
implementation "de.hdodenhof:circleimageview:$rootProject.circleImageVersion"
112101

113-
implementation "android.arch.lifecycle:extensions:1.1.1"
114-
annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
102+
implementation "android.arch.lifecycle:extensions:$rootProject.lifecycleExtensionsVersion"
103+
104+
implementation "com.github.bumptech.glide:glide:$glideVersion"
105+
annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
115106
}
116107

117108
apply from: "../artifacts.gradle"

Diff for: ‎sample-conference-java/app/google-services.json

+8-162
Original file line numberDiff line numberDiff line change
@@ -1,183 +1,29 @@
11
{
22
"project_info": {
3-
"project_number": "247738611464",
4-
"firebase_url": "https://qb-prod-samples.firebaseio.com",
5-
"project_id": "qb-prod-samples",
6-
"storage_bucket": "qb-prod-samples.appspot.com"
3+
"project_number": "Put here your value",
4+
"firebase_url": "https://qb-samples.firebaseio.com",
5+
"project_id": "qb-samples",
6+
"storage_bucket": "qb-samples.appspot.com"
77
},
88
"client": [
99
{
1010
"client_info": {
11-
"mobilesdk_app_id": "1:247738611464:android:beb270faa2c3a789",
12-
"android_client_info": {
13-
"package_name": "com.quickblox.sample.chat.java"
14-
}
15-
},
16-
"oauth_client": [],
17-
"api_key": [
18-
{
19-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
20-
}
21-
],
22-
"services": {
23-
"appinvite_service": {
24-
"other_platform_oauth_client": [
25-
{
26-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
27-
"client_type": 3
28-
}
29-
]
30-
}
31-
}
32-
},
33-
{
34-
"client_info": {
35-
"mobilesdk_app_id": "1:247738611464:android:1cdc72e9ffd29448",
36-
"android_client_info": {
37-
"package_name": "com.quickblox.sample.chat.kotlin"
38-
}
39-
},
40-
"oauth_client": [],
41-
"api_key": [
42-
{
43-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
44-
}
45-
],
46-
"services": {
47-
"appinvite_service": {
48-
"other_platform_oauth_client": [
49-
{
50-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
51-
"client_type": 3
52-
}
53-
]
54-
}
55-
}
56-
},
57-
{
58-
"client_info": {
59-
"mobilesdk_app_id": "1:247738611464:android:06cb0de4c719ad84",
60-
"android_client_info": {
61-
"package_name": "com.quickblox.sample.pushnotifications.java"
62-
}
63-
},
64-
"oauth_client": [],
65-
"api_key": [
66-
{
67-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
68-
}
69-
],
70-
"services": {
71-
"appinvite_service": {
72-
"other_platform_oauth_client": [
73-
{
74-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
75-
"client_type": 3
76-
}
77-
]
78-
}
79-
}
80-
},
81-
{
82-
"client_info": {
83-
"mobilesdk_app_id": "1:247738611464:android:c2749661061637f0",
84-
"android_client_info": {
85-
"package_name": "com.quickblox.sample.pushnotifications.kotlin"
86-
}
87-
},
88-
"oauth_client": [],
89-
"api_key": [
90-
{
91-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
92-
}
93-
],
94-
"services": {
95-
"appinvite_service": {
96-
"other_platform_oauth_client": [
97-
{
98-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
99-
"client_type": 3
100-
}
101-
]
102-
}
103-
}
104-
},
105-
{
106-
"client_info": {
107-
"mobilesdk_app_id": "1:7856__0243",
11+
"mobilesdk_app_id": "Put here your value",
10812
"android_client_info": {
10913
"package_name": "com.quickblox.sample.videochat.conference.java"
11014
}
11115
},
11216
"oauth_client": [
11317
{
114-
"client_id": "7856____content.com",
18+
"client_id": "Put here your value",
11519
"client_type": 3
11620
}
11721
],
11822
"api_key": [
11923
{
120-
"current_key": "AIza000___Gk"
121-
}
122-
],
123-
"services": {
124-
"appinvite_service": {
125-
"other_platform_oauth_client": [
126-
{
127-
"client_id": "78564____content.com",
128-
"client_type": 3
129-
}
130-
]
131-
}
132-
}
133-
},
134-
{
135-
"client_info": {
136-
"mobilesdk_app_id": "1:247738611464:android:99e5b55a490c901c",
137-
"android_client_info": {
138-
"package_name": "com.quickblox.sample.videochat.java"
139-
}
140-
},
141-
"oauth_client": [],
142-
"api_key": [
143-
{
144-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
145-
}
146-
],
147-
"services": {
148-
"appinvite_service": {
149-
"other_platform_oauth_client": [
150-
{
151-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
152-
"client_type": 3
153-
}
154-
]
155-
}
156-
}
157-
},
158-
{
159-
"client_info": {
160-
"mobilesdk_app_id": "1:247738611464:android:ac22e0d1b3a3e86b",
161-
"android_client_info": {
162-
"package_name": "com.quickblox.sample.videochat.kotlin"
163-
}
164-
},
165-
"oauth_client": [],
166-
"api_key": [
167-
{
168-
"current_key": "AIzaSyBFXAfVr6kkFJdDNOm8U-c7iju0qIUkc_A"
169-
}
170-
],
171-
"services": {
172-
"appinvite_service": {
173-
"other_platform_oauth_client": [
174-
{
175-
"client_id": "247738611464-v2nvd29bmqum7niosnfuh28oq3beh9f6.apps.googleusercontent.com",
176-
"client_type": 3
177-
}
178-
]
24+
"current_key": "Put here your value"
17925
}
180-
}
26+
]
18127
}
18228
],
18329
"configuration_version": "1"

Diff for: ‎sample-conference-java/app/proguard-rules.pro

+17-40
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# Add project specific ProGuard rules here.
22
# By default, the flags in this file are appended to flags specified
3-
# in /home/tereha/Android/sdk/tools/proguard/proguard-android.txt
3+
44
# You can edit the include path and order by changing the proguardFiles
55
# directive in build.gradle.
66
#
77
# For more details, see
8-
# http://developer.android.com/guide/developing/tools/proguard.html
9-
10-
# Add any project specific keep options here:
8+
# http://developer.android.com/guide/developing/tools/proguard.html
119

1210
# If your project uses WebView with JS, uncomment the following
1311
# and specify the fully qualified class name to the JavaScript interface
@@ -23,48 +21,27 @@
2321
##---------------Begin: proguard configuration for Gson ----------
2422
# Gson uses generic type information stored in a class file when working with fields. Proguard
2523
# removes such information by default, so configure it to keep all of it.
24+
-keepattributes EnclosingMethod
25+
-keepattributes InnerClasses
2626
-keepattributes Signature
27+
-keepattributes Exceptions
2728

28-
# For using GSON @Expose annotation
29+
# for using GSON @Expose annotation
2930
-keepattributes *Annotation*
3031

31-
# Gson specific classes
32-
-keep class sun.misc.Unsafe { *; }
33-
#-keep class com.google.gson.stream.** { *; }
34-
35-
# Application classes that will be serialized/deserialized over Gson
36-
-keep class com.quickblox.core.account.model.** { *; }
37-
38-
39-
##---------------End: proguard configuration for Gson ----------
40-
#quickblox sample chat
41-
42-
-keep class com.quickblox.auth.parsers.** { *; }
43-
-keep class com.quickblox.auth.model.** { *; }
44-
-keep class com.quickblox.core.parser.** { *; }
45-
-keep class com.quickblox.core.model.** { *; }
46-
-keep class com.quickblox.core.server.** { *; }
47-
-keep class com.quickblox.core.rest.** { *; }
48-
-keep class com.quickblox.core.error.** { *; }
49-
-keep class com.quickblox.core.Query { *; }
50-
51-
-keep class com.quickblox.users.parsers.** { *; }
52-
-keep class com.quickblox.users.model.** { *; }
53-
54-
-keep class com.quickblox.chat.parser.** { *; }
55-
-keep class com.quickblox.chat.model.** { *; }
56-
57-
-keep class com.quickblox.messages.parsers.** { *; }
58-
-keep class com.quickblox.messages.model.** { *; }
59-
60-
-keep class com.quickblox.content.parsers.** { *; }
61-
-keep class com.quickblox.content.model.** { *; }
32+
# quickblox sdk
33+
-keep class com.quickblox.** { *; }
6234

35+
# smack xmpp library
36+
-keep class org.jxmpp.** { *; }
6337
-keep class org.jivesoftware.** { *; }
38+
-dontwarn org.jivesoftware.**
39+
40+
# webrtc
41+
-keep class org.webrtc.** { *; }
6442

65-
#sample chat
66-
-keep class android.support.v7.** { *; }
43+
# glide
6744
-keep class com.bumptech.** { *; }
6845

69-
-dontwarn org.jivesoftware.smackx.**
70-
-dontwarn android.support.v4.app.**
46+
# google gms
47+
-keep class com.google.android.gms.** { *; }

0 commit comments

Comments
 (0)