Merge branch 'stable-2.15'
* stable-2.15: Upgrade GWT to version 2.8.2 Remove duplicate SHA1 variable in js.bzl Change-Id: I6a612513e281accc197e88bbeceeef3ecb77e170
This commit is contained in:
@@ -104,18 +104,18 @@ maven_jar(
|
||||
sha1 = "5d9e2e895e3111622720157d0aa540066d5fce3a",
|
||||
)
|
||||
|
||||
GWT_VERS = "2.8.1"
|
||||
GWT_VERS = "2.8.2"
|
||||
|
||||
maven_jar(
|
||||
name = "user",
|
||||
artifact = "com.google.gwt:gwt-user:" + GWT_VERS,
|
||||
sha1 = "9a13fbee70848f1f1cddd3ae33ad180af3392d9e",
|
||||
sha1 = "a2b9be2c996a658c4e009ba652a9c6a81c88a797",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
name = "dev",
|
||||
artifact = "com.google.gwt:gwt-dev:" + GWT_VERS,
|
||||
sha1 = "c7e88c07e9cda90cc623b4451d0d9713ae03aa53",
|
||||
sha1 = "7a87e060bbf129386b7ae772459fb9f87297c332",
|
||||
)
|
||||
|
||||
maven_jar(
|
||||
|
@@ -164,6 +164,7 @@ java_library(
|
||||
java_library(
|
||||
name = "jsr305",
|
||||
data = ["//lib:LICENSE-Apache2.0"],
|
||||
visibility = ["//visibility:public"],
|
||||
exports = ["@jsr305//jar"],
|
||||
)
|
||||
|
||||
|
@@ -62,6 +62,7 @@ GWT_PLUGIN_DEPS = [
|
||||
]
|
||||
|
||||
GWT_TRANSITIVE_DEPS = [
|
||||
"//lib:jsr305",
|
||||
"//lib/gwt:ant",
|
||||
"//lib/gwt:colt",
|
||||
"//lib/gwt:javax-validation",
|
||||
|
@@ -21,7 +21,7 @@ def _npm_binary_impl(ctx):
|
||||
"""rule to download a NPM archive."""
|
||||
name = ctx.name
|
||||
version= NPM_VERSIONS[name]
|
||||
sha1 = NPM_VERSIONS[name]
|
||||
sha1 = NPM_SHA1S[name]
|
||||
|
||||
dir = '%s-%s' % (name, version)
|
||||
filename = '%s.tgz' % dir
|
||||
@@ -38,7 +38,6 @@ def _npm_binary_impl(ctx):
|
||||
python = ctx.which("python")
|
||||
script = ctx.path(ctx.attr._download_script)
|
||||
|
||||
sha1 = NPM_SHA1S[name]
|
||||
args = [python, script, "-o", dest, "-u", url, "-v", sha1]
|
||||
out = ctx.execute(args)
|
||||
if out.return_code:
|
||||
|
Reference in New Issue
Block a user