Skip to content

Commit 2cd2972

Browse files
committed
处理依赖包版本冲突
1 parent a772502 commit 2cd2972

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

sdk/video-link-android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
dependencies {
4242
// api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
4343
embed (name:'android_gvoice-release',ext:'aar')
44-
implementation 'com.google.code.gson:gson:2.12.1'
44+
implementation 'com.google.code.gson:gson:2.8.5'
4545
testImplementation 'junit:junit:4.+'
4646
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4747
//kotlin协程

sdkdemo/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,7 @@ dependencies {
8888
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
8989
implementation 'com.squareup.picasso:picasso:2.71828'
9090
implementation 'com.squareup.okhttp3:okhttp:3.0.1'
91-
testImplementation 'junit:junit:4.12'
92-
androidTestImplementation 'androidx.test:runner:1.2.0'
93-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
91+
testImplementation 'junit:junit:4.+'
9492
testImplementation 'org.robolectric:robolectric:4.5.1'
9593
testImplementation ('org.bouncycastle:bcprov-jdk15on:1.64') {
9694
force = true

0 commit comments

Comments
 (0)