正在显示
5 个修改的文件
包含
14 行增加
和
10 行删除
| @@ -52,13 +52,14 @@ ext { | @@ -52,13 +52,14 @@ ext { | ||
| 52 | minVersion : 21, | 52 | minVersion : 21, |
| 53 | ] | 53 | ] |
| 54 | versions = [ | 54 | versions = [ |
| 55 | - androidx_core : "1.6.0", | 55 | + androidx_core : "1.7.0", |
| 56 | androidx_lifecycle: "2.4.0", | 56 | androidx_lifecycle: "2.4.0", |
| 57 | autoService : '1.0.1', | 57 | autoService : '1.0.1', |
| 58 | dagger : "2.27", | 58 | dagger : "2.27", |
| 59 | groupie : "2.9.0", | 59 | groupie : "2.9.0", |
| 60 | junit : "4.13.2", | 60 | junit : "4.13.2", |
| 61 | junitJupiter : "5.5.0", | 61 | junitJupiter : "5.5.0", |
| 62 | + coroutines : "1.6.0", | ||
| 62 | lint : "30.0.1", | 63 | lint : "30.0.1", |
| 63 | protobuf : "3.15.1", | 64 | protobuf : "3.15.1", |
| 64 | ] | 65 | ] |
| @@ -70,7 +71,10 @@ ext { | @@ -70,7 +71,10 @@ ext { | ||
| 70 | 'service' : "com.google.auto.service:auto-service:${versions.autoService}", | 71 | 'service' : "com.google.auto.service:auto-service:${versions.autoService}", |
| 71 | 'serviceAnnotations': "com.google.auto.service:auto-service-annotations:${versions.autoService}", | 72 | 'serviceAnnotations': "com.google.auto.service:auto-service-annotations:${versions.autoService}", |
| 72 | ], | 73 | ], |
| 73 | - kotlinx_coroutines: "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0", | 74 | + coroutines : [ |
| 75 | + "lib" : "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}", | ||
| 76 | + "test": "org.jetbrains.kotlinx:kotlinx-coroutines-test: ${versions.coroutines}", | ||
| 77 | + ], | ||
| 74 | timber : "com.github.ajalt:timberkt:1.5.1", | 78 | timber : "com.github.ajalt:timberkt:1.5.1", |
| 75 | // lint | 79 | // lint |
| 76 | lint : "com.android.tools.lint:lint:${versions.lint}", | 80 | lint : "com.android.tools.lint:lint:${versions.lint}", |
| @@ -102,11 +102,11 @@ dokkaHtml { | @@ -102,11 +102,11 @@ dokkaHtml { | ||
| 102 | dependencies { | 102 | dependencies { |
| 103 | protobuf files(generated.protoSrc) | 103 | protobuf files(generated.protoSrc) |
| 104 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | 104 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
| 105 | - implementation deps.kotlinx_coroutines | 105 | + implementation deps.coroutines.lib |
| 106 | implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' | 106 | implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' |
| 107 | - api 'com.github.webrtc-sdk:android:92.4515.02' | ||
| 108 | - api "com.squareup.okhttp3:okhttp:4.9.0" | ||
| 109 | - implementation "androidx.annotation:annotation:1.2.0" | 107 | + api 'com.github.webrtc-sdk:android:93.4577.01' |
| 108 | + api "com.squareup.okhttp3:okhttp:4.9.1" | ||
| 109 | + implementation "androidx.annotation:annotation:1.3.0" | ||
| 110 | implementation "androidx.core:core:${versions.androidx_core}" | 110 | implementation "androidx.core:core:${versions.androidx_core}" |
| 111 | implementation "com.google.protobuf:protobuf-java:${versions.protobuf}" | 111 | implementation "com.google.protobuf:protobuf-java:${versions.protobuf}" |
| 112 | implementation "com.google.protobuf:protobuf-java-util:${versions.protobuf}" | 112 | implementation "com.google.protobuf:protobuf-java-util:${versions.protobuf}" |
| @@ -126,7 +126,7 @@ dependencies { | @@ -126,7 +126,7 @@ dependencies { | ||
| 126 | testImplementation 'org.mockito:mockito-core:4.0.0' | 126 | testImplementation 'org.mockito:mockito-core:4.0.0' |
| 127 | testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0" | 127 | testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0" |
| 128 | testImplementation 'androidx.test:core:1.4.0' | 128 | testImplementation 'androidx.test:core:1.4.0' |
| 129 | - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0" | 129 | + testImplementation deps.coroutines.test |
| 130 | kaptTest 'com.google.dagger:dagger-compiler:2.38' | 130 | kaptTest 'com.google.dagger:dagger-compiler:2.38' |
| 131 | androidTestImplementation 'androidx.test.ext:junit:1.1.3' | 131 | androidTestImplementation 'androidx.test.ext:junit:1.1.3' |
| 132 | androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' | 132 | androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' |
| @@ -35,7 +35,7 @@ dependencies { | @@ -35,7 +35,7 @@ dependencies { | ||
| 35 | api "androidx.core:core-ktx:${versions.androidx_core}" | 35 | api "androidx.core:core-ktx:${versions.androidx_core}" |
| 36 | api 'androidx.appcompat:appcompat:1.4.0' | 36 | api 'androidx.appcompat:appcompat:1.4.0' |
| 37 | api 'com.google.android.material:material:1.4.0' | 37 | api 'com.google.android.material:material:1.4.0' |
| 38 | - api deps.kotlinx_coroutines | 38 | + api deps.coroutines.lib |
| 39 | api deps.timber | 39 | api deps.timber |
| 40 | api "androidx.lifecycle:lifecycle-runtime-ktx:${versions.androidx_lifecycle}" | 40 | api "androidx.lifecycle:lifecycle-runtime-ktx:${versions.androidx_lifecycle}" |
| 41 | api "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.androidx_lifecycle}" | 41 | api "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.androidx_lifecycle}" |
| @@ -50,7 +50,7 @@ android { | @@ -50,7 +50,7 @@ android { | ||
| 50 | dependencies { | 50 | dependencies { |
| 51 | implementation fileTree(dir: 'libs', include: ['*.jar']) | 51 | implementation fileTree(dir: 'libs', include: ['*.jar']) |
| 52 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | 52 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
| 53 | - implementation deps.kotlinx_coroutines | 53 | + implementation deps.coroutines.lib |
| 54 | implementation "androidx.core:core-ktx:${versions.androidx_core}" | 54 | implementation "androidx.core:core-ktx:${versions.androidx_core}" |
| 55 | implementation 'androidx.appcompat:appcompat:1.3.1' | 55 | implementation 'androidx.appcompat:appcompat:1.3.1' |
| 56 | implementation 'com.google.android.material:material:1.4.0' | 56 | implementation 'com.google.android.material:material:1.4.0' |
| @@ -35,7 +35,7 @@ android { | @@ -35,7 +35,7 @@ android { | ||
| 35 | dependencies { | 35 | dependencies { |
| 36 | implementation fileTree(dir: 'libs', include: ['*.jar']) | 36 | implementation fileTree(dir: 'libs', include: ['*.jar']) |
| 37 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | 37 | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" |
| 38 | - implementation deps.kotlinx_coroutines | 38 | + implementation deps.coroutines.lib |
| 39 | implementation 'com.google.android.material:material:1.4.0' | 39 | implementation 'com.google.android.material:material:1.4.0' |
| 40 | implementation 'androidx.appcompat:appcompat:1.4.0' | 40 | implementation 'androidx.appcompat:appcompat:1.4.0' |
| 41 | implementation "androidx.core:core-ktx:${versions.androidx_core}" | 41 | implementation "androidx.core:core-ktx:${versions.androidx_core}" |
-
请 注册 或 登录 后发表评论