Upgrade to protobuf-gradle-plugin 0.9.3
- Add a fix for users of this plugin to call correct
sourceSets object as it is now shadowed by protobuf extension
getSourceSets
https://github.com/google/protobuf-gradle-plugin/blame/master/src/main/groovy/com/google/protobuf/gradle/ProtobufExtension.groovy#L75
- Pulls in a fix for https://github.com/google/protobuf-gradle-plugin/issues/687
Test: ./gradlew bOS --dry-run
Change-Id: Id1c0a7e809e7067933be260c51a68140990db78e
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3431ba0..abfe27d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -236,7 +236,7 @@
paparazziNativeMacOsX64 = { module = "app.cash.paparazzi:layoutlib-native-macosx", version.ref = "paparazziNative" }
protobuf = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
protobufCompiler = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
-protobufGradlePluginz = { module = "com.google.protobuf:protobuf-gradle-plugin", version = "0.9.0" }
+protobufGradlePluginz = { module = "com.google.protobuf:protobuf-gradle-plugin", version = "0.9.3" }
protobufLite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf" }
protobufKotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
reactiveStreams = { module = "org.reactivestreams:reactive-streams", version = "1.0.0" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e80fa16..dad7adf 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -313,7 +313,10 @@
<trusted-key id="ae9e53fc28ff2ab1012273d0bf1518e0160788a2" group="org.apache" name="apache"/>
<trusted-key id="afa2b1823fc021bfd08c211fd5f4c07a434ab3da" group="com.squareup"/>
<trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
- <trusted-key id="b02335aa54ccf21e52bbf9abd9c565aa72ba2fdd" group="io.grpc"/>
+ <trusted-key id="b02335aa54ccf21e52bbf9abd9c565aa72ba2fdd">
+ <trusting group="com.google.protobuf"/>
+ <trusting group="io.grpc"/>
+ </trusted-key>
<trusted-key id="b252e5789636134a311e4463971b04f56669b805" group="com.google.jsilver"/>
<trusted-key id="b41089a2da79b0fa5810252872385ff0af338d52" group="org.threeten"/>
<trusted-key id="b46dc71e03feeb7f89d1f2491f7a8f87b9d8f501" group="org.jetbrains.trove4j"/>
@@ -615,14 +618,6 @@
<sha256 value="683be0cd32af9c80a6d4a143b9a6ac2eb45ebc3ccd16db4ca11b94e55fc5e52f" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
- <component group="gradle.plugin.com.google.protobuf" name="protobuf-gradle-plugin" version="0.8.13">
- <artifact name="protobuf-gradle-plugin-0.8.13.jar">
- <sha256 value="8a04b6eee4eab68c73b6e61cc8e00206753691b781d042afbae746f97e8c6f2d" origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- <artifact name="protobuf-gradle-plugin-0.8.13.pom">
- <sha256 value="d8c46016037cda6360561b9c6a21a6c2a4847cad15c3c63903e15328fbcccc45" origin="Generated by Gradle" reason="Artifact is not signed"/>
- </artifact>
- </component>
<component group="javax.annotation" name="jsr250-api" version="1.0">
<artifact name="jsr250-api-1.0.jar">
<sha256 value="a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f" origin="Generated by Gradle"/>
