Skip to content

Commit caca1f0

Browse files
authored
Upgrade protobuf plugin to 0.10.0 (#896)
1 parent afd0f51 commit caca1f0

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

google-ads/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020

21-
import com.google.common.collect.Sets
2221
import groovy.json.JsonSlurper
2322

2423
import java.util.stream.Collectors
@@ -27,7 +26,7 @@ import static nl.javadude.gradle.plugins.license.DownloadLicensesExtension.licen
2726

2827
plugins {
2928
id 'com.google.api-ads.java-conventions'
30-
id 'com.google.protobuf' version '0.8.15'
29+
id 'com.google.protobuf' version '0.10.0'
3130
id "com.github.hierynomus.license-report" version "0.16.1"
3231
}
3332

@@ -155,7 +154,7 @@ task verifyLicenses() {
155154
.map { it.licenseName }
156155
.collect(Collectors.toSet())
157156
// Computes which licenses are in use but not permitted.
158-
def notAllowed = Sets.difference(licenseNames, allowedLicenseNames)
157+
def notAllowed = licenseNames - allowedLicenseNames
159158
if (!notAllowed.empty) {
160159
throw new GradleException(
161160
"""Licenses found which were not allowed: ${notAllowed}
@@ -345,7 +344,7 @@ sourceSets {
345344
// Adds the generated .java files from the protobuf plugin. This
346345
// isn't necessary strictly for Gradle, but IntelliJ doesn't
347346
// include the directory without this line.
348-
srcDir new File(buildDir, 'generated/source/proto/test')
347+
srcDir new File(buildDir, 'generated/sources/proto/test')
349348
}
350349
proto {
351350
srcDir 'src/test/resources/protos/'

0 commit comments

Comments
 (0)