From 30a91301df378d1943f879c1215076fd34e16130 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 24 Feb 2020 16:23:05 -0500 Subject: [PATCH 1/3] dep: update protobuf and gRPC @chingor13 fixes #845 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index c5a0bfa1f..545e8e724 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,9 +23,9 @@ version.gax_httpjson=0.70.1 # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.11.1 +version.com_google_protobuf=3.11.4 version.google_java_format=1.1 -version.io_grpc=1.27.0 +version.io_grpc=1.27.1 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). From 63a938b1569a09d6f0eff461576b4d3f752c56d6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 24 Feb 2020 17:13:16 -0500 Subject: [PATCH 2/3] remove java format plugin that's not compatible with java 11 --- build.gradle | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/build.gradle b/build.gradle index bb80466d9..14b530d67 100644 --- a/build.gradle +++ b/build.gradle @@ -14,13 +14,10 @@ buildscript { "com.github.jengelman.gradle.plugins:shadow:1.2.4", "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.8.0", "gradle.plugin.com.dorongold.plugins:task-tree:1.3.1" - - classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6" } } apply plugin: 'java' -apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) @@ -34,13 +31,6 @@ ext { libraryVendor = 'Google' } -googleJavaFormat { - exclude '.apt_generated/**' - exclude 'bin/**' - exclude 'build/**' - exclude 'bazel*/**' -} - if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword') && !nonReleaseProjects.contains(project.name)) { // Nexus staging plugin only works at root project level @@ -55,8 +45,6 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword') allprojects { // Formatting tasks // ================ - apply plugin: 'com.github.sherter.google-java-format' - test.dependsOn verifyGoogleJavaFormat task verifyLicense { doLast { From 78617fb8df228e09df3ec2fe2db6fec4c723364d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 26 Feb 2020 16:51:08 -0800 Subject: [PATCH 3/3] fix merge conflict --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0007a83a..69f59765f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,12 +14,13 @@ buildscript { "com.github.jengelman.gradle.plugins:shadow:1.2.4", "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.8.0", "gradle.plugin.com.dorongold.plugins:task-tree:1.3.1" - + classpath "gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8" } } apply plugin: 'java' +apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)