diff --git a/google-ads/build.gradle b/google-ads/build.gradle index a1335209c7..ec29e20cc4 100644 --- a/google-ads/build.gradle +++ b/google-ads/build.gradle @@ -18,7 +18,6 @@ */ -import com.google.common.collect.Sets import groovy.json.JsonSlurper import java.util.stream.Collectors @@ -27,7 +26,7 @@ import static nl.javadude.gradle.plugins.license.DownloadLicensesExtension.licen plugins { id 'com.google.api-ads.java-conventions' - id 'com.google.protobuf' version '0.8.15' + id 'com.google.protobuf' version '0.10.0' id "com.github.hierynomus.license-report" version "0.16.1" } @@ -155,7 +154,7 @@ task verifyLicenses() { .map { it.licenseName } .collect(Collectors.toSet()) // Computes which licenses are in use but not permitted. - def notAllowed = Sets.difference(licenseNames, allowedLicenseNames) + def notAllowed = licenseNames - allowedLicenseNames if (!notAllowed.empty) { throw new GradleException( """Licenses found which were not allowed: ${notAllowed} @@ -345,7 +344,7 @@ sourceSets { // Adds the generated .java files from the protobuf plugin. This // isn't necessary strictly for Gradle, but IntelliJ doesn't // include the directory without this line. - srcDir new File(buildDir, 'generated/source/proto/test') + srcDir new File(buildDir, 'generated/sources/proto/test') } proto { srcDir 'src/test/resources/protos/'