Skip to content

Commit

Permalink
Move protoc artefact to version catalog (#2387)
Browse files Browse the repository at this point in the history
  • Loading branch information
@oas004
oas004 committed Sep 18, 2024
1 parent ae5d886 commit ec22c29
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 22 deletions.
8 changes: 4 additions & 4 deletions ai/sample/core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ android {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
create("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"
artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
}
}
generateProtoTasks {
Expand Down
8 changes: 4 additions & 4 deletions auth/sample/shared/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ android {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
create("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"
artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
}
}
generateProtoTasks {
Expand Down
4 changes: 2 additions & 2 deletions datalayer/core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ android {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
id("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
}
generateProtoTasks {
Expand Down
8 changes: 4 additions & 4 deletions datalayer/grpc/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,17 @@ project.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().config

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
create("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"
artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
}
}
generateProtoTasks {
Expand Down
8 changes: 4 additions & 4 deletions datalayer/sample/shared/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ android {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
create("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.66.0"
artifact = libs.protobuf.protoc.gen.grpc.java.get().toString()
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar"
artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString()
}
}
generateProtoTasks {
Expand Down
4 changes: 2 additions & 2 deletions datalayer/sample/wear/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ sourceSets {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
id("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
}
generateProtoTasks {
Expand Down
7 changes: 7 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ okio = "3.9.1"
org-robolectric = "4.13"
playServicesAuth = "21.2.0"
protobuf = "4.28.1"
protobuf-gen-grpc-java = "1.66.0"
protobuf-gen-grpc-kotlin = "1.3.0:jdk8@jar"
protobuf-gen-javalite = "3.0.0"
roborazzi = "1.26.0"
room = "2.6.1"
runtimeTracing = "1.0.0-beta01"
Expand Down Expand Up @@ -193,6 +196,10 @@ playservices-auth = { module = "com.google.android.gms:play-services-auth", vers
playservices-base = "com.google.android.gms:play-services-base:18.5.0"
playservices-wearable = "com.google.android.gms:play-services-wearable:18.2.0"
protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf" }
protobuf-protoc-gen-grpc-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "protobuf-gen-grpc-java"}
protobuf-protoc-gen-grpc-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "protobuf-gen-grpc-kotlin"}
protobuf-protoc-gen-javalite = { module = "com.google.protobuf:protoc-gen-javalite", version.ref = "protobuf-gen-javalite" }
protobuf-protoc-stnd = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
retrofit2-convertermoshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "com-squareup-retrofit2" }
retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
robolectric = { module = "org.robolectric:robolectric", version.ref = "org-robolectric" }
Expand Down
4 changes: 2 additions & 2 deletions media/sample/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ android {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:4.28.1"
artifact = libs.protobuf.protoc.stnd.get().toString()
}
plugins {
id("javalite") {
artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
artifact = libs.protobuf.protoc.gen.javalite.get().toString()
}
}
generateProtoTasks {
Expand Down

0 comments on commit ec22c29

Please sign in to comment.