Merge branch 'stable-3.2' This unreverts "Revert "Add Polymer 3 support"". * stable-3.2: Upgrade Gerrit API to 3.2.10 Revert "Add Polymer 3 support" Upgrade Gerrit API to 3.1.15 Update Gerrit API to 3.0.16 Update Gerrit API to 2.16.27 Upgrade Gerrit API to 3.1.12 Update Gerrit API to 3.0.15 Update Gerrit API to 2.16.26 Change-Id: I71a5b6fd0f98031f541e41694812982958b8f9b9
diff --git a/README.md b/README.md index 725a35d..e74d20a 100644 --- a/README.md +++ b/README.md
@@ -36,9 +36,9 @@ ```python load("@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api") -gerrit_api(version = "3.1.6", - plugin_api_sha1 = "e57f6465c9805f568082bffffd61a2771f10d68a", - acceptance_framework_sha1 = "ebfd50383f8593678b451c81dbc332db8e8da188") +gerrit_api(version = "3.2.1", + plugin_api_sha1 = "47019cf43ef7e6e8d2d5c0aeba0407d23c93699c", + acceptance_framework_sha1 = "6252cab6d1f76202e57858fcffb428424e90b128") ``` If the version ends in `-SNAPSHOT`, the jars are consumed from the local @@ -47,7 +47,7 @@ ```python load("@com_googlesource_gerrit_bazlets//:gerrit_api.bzl", "gerrit_api") -gerrit_api(version = "3.1.7-SNAPSHOT") +gerrit_api(version = "3.3.0-SNAPSHOT") ``` <a name="basic-example"></a>
diff --git a/bouncycastle.bzl b/bouncycastle.bzl index 02960bc..d9025bf 100644 --- a/bouncycastle.bzl +++ b/bouncycastle.bzl
@@ -5,23 +5,23 @@ """ # This should be the same version used in Gerrit. -BC_VERS = "1.60" +BC_VERS = "1.61" def bouncycastle_repos(): maven_jar( name = "bouncycastle_bcprov", artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS, - sha1 = "bd47ad3bd14b8e82595c7adaa143501e60842a84", + sha1 = "00df4b474e71be02c1349c3292d98886f888d1f7", ) maven_jar( name = "bouncycastle_bcpg", artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS, - sha1 = "13c7a199c484127daad298996e95818478431a2c", + sha1 = "422656435514ab8a28752b117d5d2646660a0ace", ) maven_jar( name = "bouncycastle_bcpkix", artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS, - sha1 = "d0c46320fbc07be3a24eb13a56cee4e3d38e0c75", + sha1 = "89bb3aa5b98b48e584eee2a7401b7682a46779b4", ) native.bind( name = "bcprov",
diff --git a/gerrit_api.bzl b/gerrit_api.bzl index 9d1f943..2a30fd9 100644 --- a/gerrit_api.bzl +++ b/gerrit_api.bzl
@@ -7,9 +7,9 @@ gerrit_api is rule for fetching Gerrit plugin API using Bazel. """ -def gerrit_api(version = "3.2.10", - plugin_api_sha1 = "86ace0ca309f1fc56815535fabe2e0a4073b3c39", - acceptance_framework_sha1 = "fd7f6aff9f8301c324c8aafbb3a6543b2708202c"): +def gerrit_api(version = "3.3.1", + plugin_api_sha1 = "5369f0eb208a93137da198a35ff2dc9f1e921cd7", + acceptance_framework_sha1 = "363f1cdb6db418c1105db27071d0f5c4a1a04c22"): gerrit_api_version( name = "gerrit_api_version", version = version,
diff --git a/gerrit_polymer.bzl b/gerrit_polymer.bzl index 2d019d2..735d22f 100644 --- a/gerrit_polymer.bzl +++ b/gerrit_polymer.bzl
@@ -16,3 +16,9 @@ sha256 = "5a589bdba674e1fec7188e9251c8624ebf2d4d969beb6635f9148f420d1e08b1", urls = ["https://raw.githubusercontent.com/google/closure-compiler/775609aad61e14aef289ebec4bfc09ad88877f9e/contrib/externs/polymer-1.0.js"], ) + + http_archive( + name = "build_bazel_rules_nodejs", + sha256 = "1134ec9b7baee008f1d54f0483049a97e53a57cd3913ec9d6db625549c98395a", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.4.0/rules_nodejs-3.4.0.tar.gz"], + )
diff --git a/tools/js.bzl b/tools/js.bzl index 21cfa73..7bd33da 100644 --- a/tools/js.bzl +++ b/tools/js.bzl
@@ -1,6 +1,10 @@ load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library") load("//lib/js:npm.bzl", "NPM_SHA1S", "NPM_VERSIONS") +load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") +load("@npm//@bazel/terser:index.bzl", "terser_minified") +load("@com_googlesource_gerrit_bazlets//tools:genrule2.bzl", "genrule2") + NPMJS = "NPMJS" GERRIT = "GERRIT:" @@ -519,3 +523,56 @@ name = name, srcs = static_files, ) + +def gerrit_js_bundle(name, srcs, entry_point): + """Produces a Gerrit JavaScript bundle archive. + + This rule bundles and minifies the javascript files of a frontend plugin and + produces a file archive. + Output of this rule is an archive with "${name}.jar" with specific layout for + Gerrit frontend plugins. That archive should be provided to gerrit_plugin + rule as resource_jars attribute. + + Args: + name: Plugin name. + srcs: Plugin sources. + entry_point: Plugin entry_point. + """ + + bundle = name + "-bundle" + minified = name + ".min" + main = name + ".js" + + rollup_bundle( + name = bundle, + srcs = srcs, + entry_point = entry_point, + format = "iife", + sourcemap = "hidden", + ) + + terser_minified( + name = minified, + sourcemap = False, + src = bundle, + ) + + native.genrule( + name = name + "_rename_js", + srcs = [minified], + outs = [main], + cmd = "cp $< $@", + output_to_bindir = True, + ) + + genrule2( + name = name, + srcs = [main], + outs = [name + ".jar"], + cmd = " && ".join([ + "mkdir $$TMP/static", + "cp $(SRCS) $$TMP/static", + "cd $$TMP", + "zip -Drq $$ROOT/$@ -g .", + ]), + )
diff --git a/tools/maven_jar.bzl b/tools/maven_jar.bzl index 46aa4c1..fec3ea7 100644 --- a/tools/maven_jar.bzl +++ b/tools/maven_jar.bzl
@@ -15,6 +15,8 @@ # Port of Buck native gwt_binary() rule. See discussion in context of # https://github.com/facebook/buck/issues/109 +ECLIPSE = "ECLIPSE:" + GERRIT = "GERRIT:" GERRIT_API = "GERRIT_API:"
diff --git a/tools/pkg_war.bzl b/tools/pkg_war.bzl index 931450b..2952a03 100644 --- a/tools/pkg_war.bzl +++ b/tools/pkg_war.bzl
@@ -67,7 +67,7 @@ inputs.append(dep) if ctx.attr.web_xml: - for web_xml in ctx.attr.web_xml.files: + for web_xml in ctx.attr.web_xml.files.to_list(): inputs.append(web_xml) cmd = cmd + _add_file(ctx.attr.name, web_xml, build_output + "/WEB-INF/")
diff --git a/tools/util.py b/tools/util.py index 1d92528..5b9d455 100644 --- a/tools/util.py +++ b/tools/util.py
@@ -15,6 +15,7 @@ from os import path REPO_ROOTS = { + 'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases', 'GERRIT': 'https://gerrit-maven.storage.googleapis.com', 'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release', 'MAVEN_CENTRAL': 'https://repo1.maven.org/maven2',