Update AutoValue to 1.0
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
diff --git a/lib/auto/BUCK b/lib/auto/BUCK
index 22fbd91..a596420 100644
--- a/lib/auto/BUCK
+++ b/lib/auto/BUCK
@@ -1,39 +1,13 @@
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(
name = 'auto-value',
- id = 'com.google.auto.value:auto-value:1.0-rc2',
- sha1 = '73141b5aa77021f058d1a5391595d04ef17e8602',
+ id = 'com.google.auto.value:auto-value:1.0',
+ 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',
- deps = [
- ':auto-common',
- ':auto-service',
- '//lib:guava',
- '//lib:velocity',
- '//lib/ow2:ow2-asm',
- ],
visibility = ['PUBLIC'],
)
diff --git a/lib/auto/auto_value.defs b/lib/auto/auto_value.defs
index 59a114f..4405747 100644
--- a/lib/auto/auto_value.defs
+++ b/lib/auto/auto_value.defs
@@ -8,15 +8,11 @@
# better supported interface:
# https://github.com/facebook/buck/issues/85
AUTO_VALUE_PROCESSOR_DEPS = [
- '//lib:guava',
'//lib:velocity',
- '//lib/auto:auto-common',
- '//lib/auto:auto-service',
'//lib/auto:auto-value',
'//lib/commons:collections',
'//lib/commons:lang',
'//lib/commons:oro',
- '//lib/ow2:ow2-asm',
]
AUTO_VALUE_PROCESSORS = [
