diff options
| author | Yigit Boyar <yboyar@google.com> | 2015-10-12 18:59:27 -0700 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2015-10-28 14:33:53 -0700 |
| commit | 9784c9aaedeb863018f5fcaa0a598e8e2f8ed2f3 (patch) | |
| tree | 50d9b6a2ce235ca732e9da52026eef55e708e1ce /compiler/src/main/java/android/databinding/tool/reflection | |
| parent | 012f7781add1b38b28c0c68a94172715e635c00e (diff) | |
| download | data-binding-9784c9aaedeb863018f5fcaa0a598e8e2f8ed2f3.tar.gz | |
Data binding as studio dep + java6
This CL gets rid of the gradle plugin and instead provides
DataBindingBuilder for the gradle plugin to directly use.
Now, everything that is deployed via SDK Manager (lib and adapters)
are included as prebuilts so that we avoid accidently changing
them w/o an SDK manager release.
There is still work to do:
> re-enable proguard for externel dependencies
> release a batch to ensure everything works
Bug: 22516688
Change-Id: I83ace15bd6d3d23bf5b4ad850f36453dd23ebd43
Diffstat (limited to 'compiler/src/main/java/android/databinding/tool/reflection')
| -rw-r--r-- | compiler/src/main/java/android/databinding/tool/reflection/SdkUtil.java | 2 | ||||
| -rw-r--r-- | compiler/src/main/java/android/databinding/tool/reflection/annotation/AnnotationAnalyzer.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/src/main/java/android/databinding/tool/reflection/SdkUtil.java b/compiler/src/main/java/android/databinding/tool/reflection/SdkUtil.java index e8c962ef..da73f66f 100644 --- a/compiler/src/main/java/android/databinding/tool/reflection/SdkUtil.java +++ b/compiler/src/main/java/android/databinding/tool/reflection/SdkUtil.java @@ -103,7 +103,7 @@ public class SdkUtil { private void buildFullLookup() throws XPathExpressionException { NodeList allClasses = mDoc.getChildNodes().item(0).getChildNodes(); - mFullLookup = new HashMap<>(allClasses.getLength() * 4); + mFullLookup = new HashMap<String, Integer>(allClasses.getLength() * 4); for (int j = 0; j < allClasses.getLength(); j++) { Node node = allClasses.item(j); if (node.getNodeType() != Node.ELEMENT_NODE || !"class" diff --git a/compiler/src/main/java/android/databinding/tool/reflection/annotation/AnnotationAnalyzer.java b/compiler/src/main/java/android/databinding/tool/reflection/annotation/AnnotationAnalyzer.java index f02e0511..4f110889 100644 --- a/compiler/src/main/java/android/databinding/tool/reflection/annotation/AnnotationAnalyzer.java +++ b/compiler/src/main/java/android/databinding/tool/reflection/annotation/AnnotationAnalyzer.java @@ -37,7 +37,7 @@ public class AnnotationAnalyzer extends ModelAnalyzer { public static final Map<String, TypeKind> PRIMITIVE_TYPES; static { - PRIMITIVE_TYPES = new HashMap<>(); + PRIMITIVE_TYPES = new HashMap<String, TypeKind>(); PRIMITIVE_TYPES.put("boolean", TypeKind.BOOLEAN); PRIMITIVE_TYPES.put("byte", TypeKind.BYTE); PRIMITIVE_TYPES.put("short", TypeKind.SHORT); |