Merge pull request #2 from cgruber/update_bazel_and_rules

Update infrastructure
cgruber · Jun 16, 2020 · d5a149a · d5a149a
2 parents e6ad82a + 3fa043c
commit d5a149a
Show file tree

Hide file tree

Showing 19 changed files with 93 additions and 89 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,4 +1,3 @@
 build --javacopt=-Aautovaluegson.defaultCollectionsToEmpty=true
 build --strategy=KotlinCompile=worker
-build --nouse_ijars
 
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-0.22.0
+3.2.0
diff --git a/WORKSPACE b/WORKSPACE
@@ -2,35 +2,36 @@ workspace(name = "moe")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 # Rules and tooling versions
-RULES_KOTLIN_VERSION = "porque_no_les_dos"
-MAVEN_REPOSITORY_RULES_VERSION = "1.0-rc4"
-MAVEN_REPOSITORY_RULES_SHA = "57357874e88da816857a8ec1f8e6ffa059161ac26fecdd35202e2488dba72d57"
-KOTLIN_VERSION = "1.2.71"
-KOTLINC_RELEASE = {
- "urls": ["https:/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip".format(version = KOTLIN_VERSION)],
- "sha256": "e48292fdfed42f44230bc01f92ffd17002101d8c5aeedfa3dba3cb29c5b6ea7b",
-}
+RULES_KOTLIN_VERSION = "legacy-1.4.0-rc3"
+RULES_KOTLIN_SHA = "da0e6e1543fcc79e93d4d93c3333378f3bd5d29e82c1bc2518de0dbe048e6598"
+
+
+MAVEN_REPOSITORY_RULES_VERSION = "2.0.0-alpha-3"
+MAVEN_REPOSITORY_RULES_SHA = "853976a2e4908f010568aad8f47b1a1e87e258f33b114e6e92599dc2779938c4"
+KOTLIN_VERSION = "1.3.72"
+KOTLINC_ROOT = "https:/JetBrains/kotlin/releases/download"
+KOTLINC_URL = "{root}/v{v}/kotlin-compiler-{v}.zip".format(root = KOTLINC_ROOT, v = KOTLIN_VERSION)
+KOTLINC_SHA = "ccd0db87981f1c0e3f209a1a4acb6778f14e63fe3e561a98948b5317e526cc6c"
+
 
 # Rules and tools repositories
 http_archive(
  name = "io_bazel_rules_kotlin",
- urls = ["https:/cgruber/rules_kotlin/archive/%s.zip" % RULES_KOTLIN_VERSION],
- type = "zip",
- strip_prefix = "rules_kotlin-%s" % RULES_KOTLIN_VERSION
+ sha256 = RULES_KOTLIN_SHA,
+ urls = ["https:/bazelbuild/rules_kotlin/releases/download/%s/rules_kotlin_release.tgz" % RULES_KOTLIN_VERSION],
 )
-#local_repository(name = "io_bazel_rules_kotlin", path="../../bazelbuild/rules_kotlin")
+
 http_archive(
  name = "maven_repository_rules",
- urls = ["https:/square/bazel_maven_repository/archive/%s.zip" % MAVEN_REPOSITORY_RULES_VERSION],
- type = "zip",
- strip_prefix = "bazel_maven_repository-%s" % MAVEN_REPOSITORY_RULES_VERSION,
  sha256 = MAVEN_REPOSITORY_RULES_SHA,
+ strip_prefix = "bazel_maven_repository-%s" % MAVEN_REPOSITORY_RULES_VERSION,
+ type = "zip",
+ urls = ["https:/square/bazel_maven_repository/archive/%s.zip" % MAVEN_REPOSITORY_RULES_VERSION],
 )
-#local_repository(name = "maven_repository_rules", path="../../bazel_maven_repository")
 
 # Setup Kotlin
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
-kotlin_repositories(compiler_release = KOTLINC_RELEASE)
+kotlin_repositories(compiler_release = { "urls": [KOTLINC_URL], "sha256": KOTLINC_SHA })
 kt_register_toolchains()
 
 
@@ -96,6 +97,6 @@ maven_repository_specification(
  "org.hamcrest:hamcrest-core:1.3": { "insecure": True },
  },
  dependency_target_substitutes = {
- "com.google.dagger": {"@maven//com/google/dagger:dagger": "@maven//com/google/dagger:dagger_api"},
+ "com.google.dagger": {"@maven//com/google/dagger:dagger": "@maven//com/google/dagger:dagger-api"},
  },
 )
diff --git a/client/src/main/java/com/google/devtools/moe/client/BUILD.bazel b/client/src/main/java/com/google/devtools/moe/client/BUILD.bazel
@@ -21,7 +21,7 @@ java_library(
  "@maven//com/google/dagger",
  "@maven//com/google/errorprone:error_prone_annotations",
  "@maven//com/google/guava",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  ],
 )
 
@@ -42,9 +42,9 @@ java_library(
  "@maven//com/google/guava",
  "@maven//com/google/code/gson",
  "@maven//com/squareup/okhttp",
- "@maven//com/mikesamuel:json_sanitizer",
+ "@maven//com/mikesamuel:json-sanitizer",
  "@maven//com/google/errorprone:error_prone_annotations",
  "@maven//com/google/code/findbugs:jsr305",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  ],
 )
diff --git a/client/src/main/java/com/google/devtools/moe/client/config/BUILD.bazel b/client/src/main/java/com/google/devtools/moe/client/config/BUILD.bazel
@@ -7,6 +7,7 @@ java_library(
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/gson",
+ "@maven//com/google/code/findbugs:jsr305",
  "@maven//com/google/auto/value",
  "@maven//com/google/code/gson",
  "@maven//com/google/guava",

diff --git a/client/src/main/java/com/google/devtools/moe/client/gson/BUILD.bazel b/client/src/main/java/com/google/devtools/moe/client/gson/BUILD.bazel
@@ -9,8 +9,8 @@ java_library(
  "@maven//com/google/auto/value",
  "@maven//com/google/guava",
  "@maven//com/google/code/gson",
- "@maven//com/mikesamuel:json_sanitizer",
+ "@maven//com/mikesamuel:json-sanitizer",
  "@maven//com/google/code/findbugs:jsr305",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  ],
 )
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
@@ -58,7 +58,7 @@ jvm_unit_test(
  name = "UtilsTest",
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client:core",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//junit",

diff --git a/client/src/test/java/com/google/devtools/moe/client/codebase/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/codebase/BUILD.bazel
@@ -7,7 +7,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//org/mockito:mockito_core",
+ "@maven//org/mockito:mockito-core",
  "@maven//org/objenesis",
  "@maven//junit",
  ],
@@ -32,7 +32,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/codebase/expressions",
  "//client/src/test/java/com/google/devtools/moe/client/testing",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",

diff --git a/client/src/test/java/com/google/devtools/moe/client/database/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/database/BUILD.bazel
@@ -5,12 +5,12 @@ jvm_unit_test(
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/code/gson",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
- "@maven//org/mockito:mockito_core",
+ "@maven//org/mockito:mockito-core",
  "@maven//org/objenesis",
  "@maven//junit",
  ],
@@ -24,7 +24,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )

diff --git a/client/src/test/java/com/google/devtools/moe/client/directives/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/directives/BUILD.bazel
@@ -44,7 +44,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -104,7 +104,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -114,7 +114,7 @@ jvm_unit_test(
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",

diff --git a/client/src/test/java/com/google/devtools/moe/client/dvcs/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/dvcs/BUILD.bazel
@@ -6,7 +6,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
@@ -19,7 +19,7 @@ jvm_unit_test(
  name = "DvcsDraftRevisionTest",
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/truth",
  "@maven//org/easymock",
  "@maven//org/objenesis",

diff --git a/client/src/test/java/com/google/devtools/moe/client/dvcs/git/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/dvcs/git/BUILD.bazel
@@ -6,7 +6,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
@@ -21,12 +21,12 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
  "@maven//org/objenesis",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -38,7 +38,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/codebase/expressions",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",

diff --git a/client/src/test/java/com/google/devtools/moe/client/dvcs/hg/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/dvcs/hg/BUILD.bazel
@@ -6,7 +6,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
@@ -21,12 +21,12 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
  "@maven//org/objenesis",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -38,12 +38,12 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/codebase/expressions",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//org/easymock",
  "@maven//org/objenesis",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
diff --git a/client/src/test/java/com/google/devtools/moe/client/repositories/BUILD.bazel b/client/src/test/java/com/google/devtools/moe/client/repositories/BUILD.bazel
@@ -6,7 +6,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -18,7 +18,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -30,7 +30,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -41,7 +41,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )
@@ -52,7 +52,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//junit",
@@ -67,7 +67,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  ],
 )

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
@@ -6,7 +6,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//junit",
@@ -28,10 +28,10 @@ jvm_unit_test(
  name = "SvnRevisionHistoryTest",
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  "@maven//org/easymock",
  "@maven//org/objenesis",
@@ -45,7 +45,7 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client:core",
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "@maven//com/google/dagger",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//junit",
@@ -62,11 +62,11 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client/config",
  "//client/src/main/java/com/google/devtools/moe/client/codebase/expressions",
  "@maven//com/google/dagger",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//javax/inject:javax_inject",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
  "@maven//org/easymock",
  "@maven//org/objenesis",

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
@@ -18,9 +18,9 @@ jvm_unit_test(
  "//client/src/main/java/com/google/devtools/moe/client",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
- "@maven//joda-time:joda_time",
+ "@maven//joda-time",
  "@maven//junit",
- "@maven//org/mockito:mockito_core",
+ "@maven//org/mockito:mockito-core",
  ],
 )
 
@@ -29,7 +29,7 @@ jvm_unit_test(
  deps = [
  "//client/src/main/java/com/google/devtools/moe/client",
  "//client/src/main/java/com/google/devtools/moe/client:core",
- "@maven//cglib:cglib_nodep",
+ "@maven//cglib:cglib-nodep",
  "@maven//com/google/guava",
  "@maven//com/google/truth",
  "@maven//junit",