正在显示
2 个修改的文件
包含
6 行增加
和
14 行删除
| @@ -40,6 +40,7 @@ ext { | @@ -40,6 +40,7 @@ ext { | ||
| 40 | versions = [ | 40 | versions = [ |
| 41 | androidx_core: "1.2.0", | 41 | androidx_core: "1.2.0", |
| 42 | dagger : "2.27", | 42 | dagger : "2.27", |
| 43 | + protobuf : "3.15.1", | ||
| 43 | ] | 44 | ] |
| 44 | generated = [ | 45 | generated = [ |
| 45 | protoSrc: "$projectDir/../livekit-server/proto", | 46 | protoSrc: "$projectDir/../livekit-server/proto", |
| @@ -38,23 +38,14 @@ android { | @@ -38,23 +38,14 @@ android { | ||
| 38 | protobuf { | 38 | protobuf { |
| 39 | protoc { | 39 | protoc { |
| 40 | // You still need protoc like in the non-Android case | 40 | // You still need protoc like in the non-Android case |
| 41 | - artifact = 'com.google.protobuf:protoc:3.0.0' | ||
| 42 | - } | ||
| 43 | - plugins { | ||
| 44 | - javalite { | ||
| 45 | - // The codegen for lite comes as a separate artifact | ||
| 46 | - artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0' | ||
| 47 | - } | 41 | + artifact = "com.google.protobuf:protoc:${versions.protobuf}" |
| 48 | } | 42 | } |
| 49 | generateProtoTasks { | 43 | generateProtoTasks { |
| 50 | all().each { task -> | 44 | all().each { task -> |
| 51 | task.builtins { | 45 | task.builtins { |
| 52 | - // In most cases you don't need the full Java output | ||
| 53 | - // if you use the lite output. | ||
| 54 | - remove java | ||
| 55 | - } | ||
| 56 | - task.plugins { | ||
| 57 | - javalite {} | 46 | + java { |
| 47 | + option "lite" | ||
| 48 | + } | ||
| 58 | } | 49 | } |
| 59 | } | 50 | } |
| 60 | } | 51 | } |
| @@ -66,7 +57,7 @@ dependencies { | @@ -66,7 +57,7 @@ dependencies { | ||
| 66 | implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' | 57 | implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2' |
| 67 | implementation 'org.webrtc:google-webrtc:1.0.32006' | 58 | implementation 'org.webrtc:google-webrtc:1.0.32006' |
| 68 | implementation "com.squareup.okhttp3:okhttp:4.9.0" | 59 | implementation "com.squareup.okhttp3:okhttp:4.9.0" |
| 69 | - implementation 'com.google.protobuf:protobuf-lite:3.0.1' | 60 | + implementation "com.google.protobuf:protobuf-javalite:${versions.protobuf}" |
| 70 | 61 | ||
| 71 | implementation 'com.google.dagger:dagger:2.32' | 62 | implementation 'com.google.dagger:dagger:2.32' |
| 72 | annotationProcessor 'com.google.dagger:dagger-compiler:2.32' | 63 | annotationProcessor 'com.google.dagger:dagger-compiler:2.32' |
-
请 注册 或 登录 后发表评论