opendev/gerrit
Code Issues Proposed changes

Update AutoValue to 1.0

Browse Source 
The upstream jar is now shaded, so direct dependencies are reduced.
However, the shaded jar contains un-relocated versions of Apache
classes, which need to be stripped out and replaced with our own
dependencies.

Change-Id: I0f0c481d75d5cc44fb787624b5bd9e88fd79f790
This commit is contained in:
Dave Borowitz
2015-01-21 14:46:02 -08:00
parent 2fa1732dc5
commit c87d29ec16
2 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/auto/BUCK
View File

@@ -1,39 +1,13 @@
include_defs('//lib/maven.defs') include_defs('//lib/maven.defs')
# TODO(dborowitz): All rules but auto-value are public only because of the hacky
# way we have to include them via auto_value.defs.
maven_jar(
name = 'auto-common',
id = 'com.google.auto:auto-common:0.3',
sha1 = '4073ab16ab4aceb9a217273da6442166bf51ae16',
license = 'Apache2.0',
deps = ['//lib:guava'],
visibility = ['PUBLIC'],
)
maven_jar(
name = 'auto-service',
id = 'com.google.auto.service:auto-service:1.0-rc2',
sha1 = '51033a5b8fcf7039159e35b6878f106ccd5fb35f',
license = 'Apache2.0',
deps = [
':auto-common',
'//lib:guava',
],
visibility = ['PUBLIC'],
)
maven_jar( maven_jar(
name = 'auto-value', name = 'auto-value',
id = 'com.google.auto.value:auto-value:1.0-rc2', id = 'com.google.auto.value:auto-value:1.0',
sha1 = '73141b5aa77021f058d1a5391595d04ef17e8602', sha1 = '5d13e60f5d190003176ca6ba4a410fae2e3f6315',
# Exclude un-relocated dependencies and replace with our own versions; see
# https://github.com/google/auto/blob/auto-value-1.0/value/pom.xml#L147
exclude = ['org/apache/*'],
deps = ['//lib:velocity'],
license = 'Apache2.0', license = 'Apache2.0',
deps = [
':auto-common',
':auto-service',
'//lib:guava',
'//lib:velocity',
'//lib/ow2:ow2-asm',
],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )

4
lib/auto/auto_value.defs
View File

@@ -8,15 +8,11 @@ AUTO_VALUE_DEP = '//lib/auto:auto-value'
# better supported interface: # better supported interface:
# https://github.com/facebook/buck/issues/85 # https://github.com/facebook/buck/issues/85
AUTO_VALUE_PROCESSOR_DEPS = [ AUTO_VALUE_PROCESSOR_DEPS = [
'//lib:guava',
'//lib:velocity', '//lib:velocity',
'//lib/auto:auto-common',
'//lib/auto:auto-service',
'//lib/auto:auto-value', '//lib/auto:auto-value',
'//lib/commons:collections', '//lib/commons:collections',
'//lib/commons:lang', '//lib/commons:lang',
'//lib/commons:oro', '//lib/commons:oro',
'//lib/ow2:ow2-asm',
] ]
AUTO_VALUE_PROCESSORS = [ AUTO_VALUE_PROCESSORS = [