Skip to content

Minor collection of Gradle 9 fixes #13109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejona86 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor collection of Gradle 9 fixes #13109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion all/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ for (subproject in subprojects) {
evaluationDependsOn(':grpc-interop-testing')

dependencies {
api subprojects.minus([project(':grpc-protobuf-lite')])
api subprojects.minus([project.project(':grpc-protobuf-lite')])
implementation libraries.guava.jre // JRE required by transitive protobuf-java-util
}

Expand Down
4 changes: 2 additions & 2 deletions gae-interop-testing/gae-jdk8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ plugins {
id "war"

id "ru.vyarus.animalsniffer"
id 'com.google.cloud.tools.appengine'
id 'com.google.cloud.tools.appengine-appenginewebxml'
}

description = 'gRPC: gae interop testing (jdk8)'
Expand Down Expand Up @@ -102,7 +102,7 @@ String getGaeProject() {
}

String getService(java.nio.file.Path projectPath) {
Node xml = new XmlParser().parse(projectPath.resolve("src/main/webapp/WEB-INF/appengine-web.xml").toFile())
Node xml = new groovy.xml.XmlParser().parse(projectPath.resolve("src/main/webapp/WEB-INF/appengine-web.xml").toFile())
if (xml.service.isEmpty()) {
return "default"
} else {
Expand Down
2 changes: 1 addition & 1 deletion netty/shaded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
project(':grpc-testing-proto'),
project(':grpc-testing'),
libraries.truth
shadow project(':grpc-netty').configurations.runtimeClasspath.allDependencies.matching {
shadow project.project(':grpc-netty').configurations.runtimeClasspath.allDependencies.matching {
it.group != 'io.netty'
}
signature (libraries.signature.java) {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pluginManagement {
// https://github.com/kt3k/coveralls-gradle-plugin/tags
id "com.github.kt3k.coveralls" version "2.12.2"
// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
id "com.google.cloud.tools.appengine" version "2.8.7"
id "com.google.cloud.tools.appengine-appenginewebxml" version "2.8.7"
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
id "com.google.cloud.tools.jib" version "3.5.4"
// https://github.com/google/osdetector-gradle-plugin/tags
Expand Down
Loading