Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions google-ads/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/


import com.google.common.collect.Sets
import groovy.json.JsonSlurper

import java.util.stream.Collectors
Expand All @@ -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"
}

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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/'
Expand Down