Skip to content

Commit 2a05a46

Browse files
lyh990517lyh990517
committed
123
1 parent 0d33107 commit 2a05a46

19 files changed

+304
-340
lines changed

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/migrations.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ android {
3030
kotlinCompilerExtensionVersion = "1.4.2"
3131
}
3232
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_8
34-
targetCompatibility JavaVersion.VERSION_1_8
33+
sourceCompatibility JavaVersion.VERSION_11
34+
targetCompatibility JavaVersion.VERSION_11
3535
}
3636
kotlinOptions {
37-
jvmTarget = '1.8'
37+
jvmTarget = '11'
3838
}
39-
viewBinding{
39+
viewBinding {
4040
enabled = true
4141
}
4242
dataBinding {
@@ -58,7 +58,7 @@ dependencies {
5858
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
5959

6060
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
61-
implementation 'org.webrtc:google-webrtc:1.0.32006'
61+
implementation 'org.webrtc:google-webrtc:1.0.30039@aar'
6262
implementation platform('com.google.firebase:firebase-bom:31.0.3')
6363
implementation 'com.google.firebase:firebase-analytics-ktx'
6464
implementation 'com.google.firebase:firebase-firestore-ktx'

‎app/google-services.json‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,26 @@
11
{
22
"project_info": {
3-
"project_number": "601484920570",
4-
"firebase_url": "https://sendbird-chat-4dfb0-default-rtdb.asia-southeast1.firebasedatabase.app",
5-
"project_id": "sendbird-chat-4dfb0",
6-
"storage_bucket": "sendbird-chat-4dfb0.appspot.com"
3+
"project_number": "311562133773",
4+
"project_id": "webrtc2-4a875",
5+
"storage_bucket": "webrtc2-4a875.firebasestorage.app"
76
},
87
"client": [
98
{
109
"client_info": {
11-
"mobilesdk_app_id": "1:601484920570:android:9d3253051478d0287fab43",
10+
"mobilesdk_app_id": "1:311562133773:android:8016e2eaef7ccc4c7a9044",
1211
"android_client_info": {
1312
"package_name": "com.example.webrtc"
1413
}
1514
},
16-
"oauth_client": [
17-
{
18-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
19-
"client_type": 3
20-
}
21-
],
22-
"api_key": [
23-
{
24-
"current_key": "AIzaSyDJZzFgCiRaPGnHK1vSOnXmKYz5-0o9-LQ"
25-
}
26-
],
27-
"services": {
28-
"appinvite_service": {
29-
"other_platform_oauth_client": [
30-
{
31-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
32-
"client_type": 3
33-
}
34-
]
35-
}
36-
}
37-
},
38-
{
39-
"client_info": {
40-
"mobilesdk_app_id": "1:601484920570:android:d807701ed8e749ca7fab43",
41-
"android_client_info": {
42-
"package_name": "com.example.webrtc"
43-
}
44-
},
45-
"oauth_client": [
46-
{
47-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
48-
"client_type": 3
49-
}
50-
],
15+
"oauth_client": [],
5116
"api_key": [
5217
{
53-
"current_key": "AIzaSyDJZzFgCiRaPGnHK1vSOnXmKYz5-0o9-LQ"
18+
"current_key": "AIzaSyBMQAHVvajDh_TBqJZ4h4NWd0-hhAVIe6I"
5419
}
5520
],
5621
"services": {
5722
"appinvite_service": {
58-
"other_platform_oauth_client": [
59-
{
60-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
61-
"client_type": 3
62-
}
63-
]
23+
"other_platform_oauth_client": []
6424
}
6525
}
6626
}

‎data/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ android {
2525
}
2626
}
2727
compileOptions {
28-
sourceCompatibility JavaVersion.VERSION_1_8
29-
targetCompatibility JavaVersion.VERSION_1_8
28+
sourceCompatibility JavaVersion.VERSION_11
29+
targetCompatibility JavaVersion.VERSION_11
3030
}
3131
kotlinOptions {
32-
jvmTarget = '1.8'
32+
jvmTarget = '11'
3333
}
3434
}
3535

@@ -45,7 +45,7 @@ dependencies {
4545
implementation 'com.google.dagger:hilt-android:2.45'
4646
kapt 'com.google.dagger:hilt-android-compiler:2.45'
4747

48-
implementation 'org.webrtc:google-webrtc:1.0.32006'
48+
implementation 'org.webrtc:google-webrtc:1.0.30039@aar'
4949

5050
implementation platform('com.google.firebase:firebase-bom:31.0.3')
5151
implementation 'com.google.firebase:firebase-analytics-ktx'

‎data/google-services.json‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,26 @@
11
{
22
"project_info": {
3-
"project_number": "601484920570",
4-
"firebase_url": "https://sendbird-chat-4dfb0-default-rtdb.asia-southeast1.firebasedatabase.app",
5-
"project_id": "sendbird-chat-4dfb0",
6-
"storage_bucket": "sendbird-chat-4dfb0.appspot.com"
3+
"project_number": "311562133773",
4+
"project_id": "webrtc2-4a875",
5+
"storage_bucket": "webrtc2-4a875.firebasestorage.app"
76
},
87
"client": [
98
{
109
"client_info": {
11-
"mobilesdk_app_id": "1:601484920570:android:9d3253051478d0287fab43",
10+
"mobilesdk_app_id": "1:311562133773:android:8016e2eaef7ccc4c7a9044",
1211
"android_client_info": {
1312
"package_name": "com.example.data"
1413
}
1514
},
16-
"oauth_client": [
17-
{
18-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
19-
"client_type": 3
20-
}
21-
],
22-
"api_key": [
23-
{
24-
"current_key": "AIzaSyDJZzFgCiRaPGnHK1vSOnXmKYz5-0o9-LQ"
25-
}
26-
],
27-
"services": {
28-
"appinvite_service": {
29-
"other_platform_oauth_client": [
30-
{
31-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
32-
"client_type": 3
33-
}
34-
]
35-
}
36-
}
37-
},
38-
{
39-
"client_info": {
40-
"mobilesdk_app_id": "1:601484920570:android:d807701ed8e749ca7fab43",
41-
"android_client_info": {
42-
"package_name": "com.example.data"
43-
}
44-
},
45-
"oauth_client": [
46-
{
47-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
48-
"client_type": 3
49-
}
50-
],
15+
"oauth_client": [],
5116
"api_key": [
5217
{
53-
"current_key": "AIzaSyDJZzFgCiRaPGnHK1vSOnXmKYz5-0o9-LQ"
18+
"current_key": "AIzaSyBMQAHVvajDh_TBqJZ4h4NWd0-hhAVIe6I"
5419
}
5520
],
5621
"services": {
5722
"appinvite_service": {
58-
"other_platform_oauth_client": [
59-
{
60-
"client_id": "601484920570-gl3lit596g82qaibo91mha81j1goctvj.apps.googleusercontent.com",
61-
"client_type": 3
62-
}
63-
]
23+
"other_platform_oauth_client": []
6424
}
6525
}
6626
}

0 commit comments

Comments
 (0)