From 686a6be3d3f031aa74c446879961363ff3256a6c Mon Sep 17 00:00:00 2001 From: Christian Gruber Date: Mon, 31 Aug 2020 11:18:21 -0700 Subject: [PATCH 1/2] Bump bazel maven repository. Also remove version tags from the build snippet templates, since they're not used --- WORKSPACE | 16 ++++++++-------- .../com/google/devtools/moe/client/BUILD.bazel | 1 + .../google/devtools/moe/client/svn/BUILD.bazel | 2 ++ .../devtools/moe/client/testing/BUILD.bazel | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 92522b05..645eb867 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -7,9 +7,9 @@ RULES_KOTLIN_VERSION = "legacy-1.4.0-rc3" RULES_KOTLIN_SHA = "da0e6e1543fcc79e93d4d93c3333378f3bd5d29e82c1bc2518de0dbe048e6598" -MAVEN_REPOSITORY_RULES_VERSION = "2.0.0-alpha-3" +MAVEN_REPOSITORY_RULES_VERSION = "2.0.0-alpha-5" -MAVEN_REPOSITORY_RULES_SHA = "853976a2e4908f010568aad8f47b1a1e87e258f33b114e6e92599dc2779938c4" +MAVEN_REPOSITORY_RULES_SHA = "fde80cafa02a2c034cc8086c158f500e7b6ceb16d251273a6cc82f1c0723e0e8" KOTLIN_VERSION = "1.3.72" @@ -58,12 +58,12 @@ maven_repository_specification( "cglib:cglib-nodep:2.2.2": {"insecure": True}, "com.google.auto.factory:auto-factory:1.0-beta6": { "insecure": True, - "build_snippet": snippets.AUTO_FACTORY.format(version = "1.0-beta6"), + "build_snippet": snippets.AUTO_FACTORY, }, "com.google.auto.value:auto-value-annotations:1.7.3": {"insecure": True}, "com.google.auto.value:auto-value:1.7.3": { "insecure": True, - "build_snippet": snippets.AUTO_VALUE.format(version = "1.7.3"), + "build_snippet": snippets.AUTO_VALUE, }, "com.google.auto:auto-common:0.10": {"insecure": True}, "com.google.code.findbugs:jsr305:3.0.2": {"insecure": True}, @@ -72,15 +72,15 @@ maven_repository_specification( "com.google.dagger:dagger-spi:2.21": {"insecure": True}, "com.google.dagger:dagger:2.21": { "insecure": True, - "build_snippet": snippets.DAGGER.format(version = "2.21"), + "build_snippet": snippets.DAGGER, }, "com.google.errorprone:error_prone_annotations:2.3.1": {"insecure": True}, "com.google.errorprone:javac-shaded:9+181-r4173-1": {"insecure": True}, "com.google.googlejavaformat:google-java-format:1.6": {"insecure": True}, "com.google.guava:guava:27.0.1-jre": { - "insecure": True, - "exclude": ["com.google.guava:listenablefuture"], - }, + "insecure": True, + "exclude": ["com.google.guava:listenablefuture"], + }, "com.google.guava:failureaccess:1.0.1": {"insecure": True}, "com.google.j2objc:j2objc-annotations:1.1": {"insecure": True}, "com.google.truth:truth:0.42": {"insecure": True}, diff --git a/client/src/test/java/com/google/devtools/moe/client/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/BUILD.bazel index 036d80bb..b459b216 100644 --- a/client/src/test/java/com/google/devtools/moe/client/BUILD.bazel +++ b/client/src/test/java/com/google/devtools/moe/client/BUILD.bazel @@ -39,6 +39,7 @@ jvm_unit_test( "//client/src/main/java/com/google/devtools/moe/client/qualifiers", "@maven//com/google/code/findbugs:jsr305", "@maven//com/google/dagger", + "@maven//com/google/errorprone:error_prone_annotations", "@maven//com/google/guava", "@maven//com/google/truth", "@maven//javax/inject:javax_inject", diff --git a/client/src/test/java/com/google/devtools/moe/client/svn/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/svn/BUILD.bazel index de5cd451..33ada393 100644 --- a/client/src/test/java/com/google/devtools/moe/client/svn/BUILD.bazel +++ b/client/src/test/java/com/google/devtools/moe/client/svn/BUILD.bazel @@ -48,6 +48,7 @@ jvm_unit_test( "//client/src/main/java/com/google/devtools/moe/client/config", "@maven//cglib:cglib-nodep", "@maven//com/google/dagger", + "@maven//com/google/errorprone:error_prone_annotations", "@maven//com/google/guava", "@maven//com/google/truth", "@maven//junit", @@ -65,6 +66,7 @@ jvm_unit_test( "//client/src/main/java/com/google/devtools/moe/client/config", "@maven//cglib:cglib-nodep", "@maven//com/google/dagger", + "@maven//com/google/errorprone:error_prone_annotations", "@maven//com/google/guava", "@maven//com/google/truth", "@maven//javax/inject:javax_inject", diff --git a/client/src/test/java/com/google/devtools/moe/client/testing/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/testing/BUILD.bazel index 392015b3..dfdf2871 100644 --- a/client/src/test/java/com/google/devtools/moe/client/testing/BUILD.bazel +++ b/client/src/test/java/com/google/devtools/moe/client/testing/BUILD.bazel @@ -6,6 +6,7 @@ java_library( visibility = ["//client/src/test:__subpackages__"], deps = [ "//client/src/main/java/com/google/devtools/moe/client", + "//client/src/main/java/com/google/devtools/moe/client/codebase/expressions", "//client/src/main/java/com/google/devtools/moe/client:core", "@maven//com/google/dagger", "@maven//javax/inject:javax_inject", From e5841fe0e2713ea3ceada2679a38aa8e4dc3289d Mon Sep 17 00:00:00 2001 From: Christian Gruber Date: Wed, 11 May 2022 08:54:34 -0700 Subject: [PATCH 2/2] Bump bazel version to most recent. --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index 944880fa..3bff0591 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.2.0 +5.1.1 \ No newline at end of file