OSDN Git Service

Project renaming
authorGeorge Mount <mount@google.com>
Tue, 27 Jan 2015 18:58:49 +0000 (10:58 -0800)
committerGeorge Mount <mount@google.com>
Tue, 27 Jan 2015 18:58:49 +0000 (10:58 -0800)
48 files changed:
tools/data-binding/annotationprocessor/build.gradle
tools/data-binding/baseLibrary/build.gradle [moved from tools/data-binding/annotations/build.gradle with 96% similarity]
tools/data-binding/baseLibrary/src/main/java/android/binding/Bindable.java [moved from tools/data-binding/annotations/src/main/java/android/binding/Bindable.java with 100% similarity]
tools/data-binding/baseLibrary/src/main/java/android/binding/BindingAdapter.java [moved from tools/data-binding/annotations/src/main/java/android/binding/BindingAdapter.java with 100% similarity]
tools/data-binding/baseLibrary/src/main/java/android/binding/BindingConversion.java [moved from tools/data-binding/annotations/src/main/java/android/binding/BindingConversion.java with 100% similarity]
tools/data-binding/baseLibrary/src/main/java/android/binding/BindingMethod.java [moved from tools/data-binding/annotations/src/main/java/android/binding/BindingMethod.java with 100% similarity]
tools/data-binding/baseLibrary/src/main/java/android/binding/BindingMethods.java [moved from tools/data-binding/annotations/src/main/java/android/binding/BindingMethods.java with 100% similarity]
tools/data-binding/compiler/build.gradle
tools/data-binding/grammarBuilder/BindingExpression.g4 [moved from tools/data-binding/grammerBuilder/BindingExpression.g4 with 100% similarity]
tools/data-binding/grammarBuilder/build.gradle [moved from tools/data-binding/grammerBuilder/build.gradle with 96% similarity]
tools/data-binding/grammarBuilder/gradle/wrapper/gradle-wrapper.jar [moved from tools/data-binding/grammerBuilder/gradle/wrapper/gradle-wrapper.jar with 100% similarity]
tools/data-binding/grammarBuilder/gradle/wrapper/gradle-wrapper.properties [moved from tools/data-binding/grammerBuilder/gradle/wrapper/gradle-wrapper.properties with 100% similarity]
tools/data-binding/grammarBuilder/gradlew [moved from tools/data-binding/grammerBuilder/gradlew with 100% similarity]
tools/data-binding/grammarBuilder/gradlew.bat [moved from tools/data-binding/grammerBuilder/gradlew.bat with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpression.tokens [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpression.tokens with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionBaseListener.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionBaseListener.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionBaseVisitor.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionBaseVisitor.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.tokens [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionLexer.tokens with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionListener.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionListener.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionParser.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionParser.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/BindingExpressionVisitor.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/BindingExpressionVisitor.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinder.tokens [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinder.tokens with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderBaseListener.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderBaseListener.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderBaseVisitor.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderBaseVisitor.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderLexer.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderLexer.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderLexer.tokens [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderLexer.tokens with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderListener.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderListener.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderParser.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderParser.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java-gen/com/android/databinding/DataBinderVisitor.java [moved from tools/data-binding/grammerBuilder/src/main/java-gen/com/android/databinding/DataBinderVisitor.java with 100% similarity]
tools/data-binding/grammarBuilder/src/main/java/com/android/databinder/parser/Main.java [moved from tools/data-binding/grammerBuilder/src/main/java/com/android/databinder/parser/Main.java with 100% similarity]
tools/data-binding/grammarBuilder/src/test/java/com/android/databinding/BindingExpressionParserTest.java [moved from tools/data-binding/grammerBuilder/src/test/java/com/android/databinding/BindingExpressionParserTest.java with 100% similarity]
tools/data-binding/library/build.gradle
tools/data-binding/library/src/test/java/com/android/databinding/library/CallbackRegistryTest.java [new file with mode: 0644]
tools/data-binding/samples/BindingDemo/app/build.gradle
tools/data-binding/settings.gradle
tools/data-binding/xmlGrammar/XMLLexer.g4 [moved from tools/data-binding/xmlGrammer/XMLLexer.g4 with 100% similarity]
tools/data-binding/xmlGrammar/XMLParser.g4 [moved from tools/data-binding/xmlGrammer/XMLParser.g4 with 100% similarity]
tools/data-binding/xmlGrammar/build.gradle [moved from tools/data-binding/xmlGrammer/build.gradle with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLLexer.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.tokens [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLLexer.tokens with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParser.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.tokens [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParser.tokens with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseListener.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParserBaseListener.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseVisitor.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParserBaseVisitor.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserListener.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParserListener.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserVisitor.java [moved from tools/data-binding/xmlGrammer/src/main/java/com/android/databinding/XMLParserVisitor.java with 100% similarity]
tools/data-binding/xmlGrammar/src/main/kotlin/xmlEditorTest.kt [moved from tools/data-binding/xmlGrammer/src/main/kotlin/xmlEditorTest.kt with 100% similarity]

index a6cd563..7e478b2 100644 (file)
@@ -37,7 +37,7 @@ sourceSets {
 }
 
 dependencies {
-    compile project(":annotations")
+    compile project(":baseLibrary")
     compile project(":compiler")
 }
 
similarity index 96%
rename from tools/data-binding/annotations/build.gradle
rename to tools/data-binding/baseLibrary/build.gradle
index 8b3ba9e..73c8970 100644 (file)
@@ -41,7 +41,7 @@ uploadArchives {
         mavenDeployer {
             repository(url: mavenLocal().url)
             pom.version = '0.3-SNAPSHOT'
-            pom.artifactId = 'annotations'
+            pom.artifactId = 'baseLibrary'
             pom.groupId='com.android.databinding'
         }
     }
index 5b169f4..5b8f742 100644 (file)
@@ -35,9 +35,9 @@ dependencies {
     compile 'org.apache.commons:commons-lang3:3.3.2'
     compile 'com.google.guava:guava:18.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    compile project(":annotations")
-    compile project(":grammerBuilder")
-    compile project(":xmlGrammer")
+    compile project(":baseLibrary")
+    compile project(":grammarBuilder")
+    compile project(":xmlGrammar")
 }
 uploadArchives {
     repositories {
@@ -48,7 +48,7 @@ uploadArchives {
     repositories {
         mavenDeployer {
             repository(url: mavenLocal().url)
-            pom.artifactId = 'grammerBuilder'
+            pom.artifactId = 'grammarBuilder'
         }
     }
 }
index 1359956..f2dc745 100644 (file)
@@ -31,6 +31,7 @@ buildscript {
 
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
+
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1"
@@ -52,10 +53,16 @@ android {
         }
     }
 }
-
+sourceSets {
+    test {
+        java {
+            srcDir 'src/test/java'
+        }
+    }
+}
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(":annotations")
+    compile project(":baseLibrary")
     provided 'com.android.support:cardview-v7:+'
     provided 'com.android.support:appcompat-v7:+'
     provided project(":annotationprocessor")
diff --git a/tools/data-binding/library/src/test/java/com/android/databinding/library/CallbackRegistryTest.java b/tools/data-binding/library/src/test/java/com/android/databinding/library/CallbackRegistryTest.java
new file mode 100644 (file)
index 0000000..56f0599
--- /dev/null
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.databinding.library;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+
+public class CallbackRegistryTest {
+
+    final Integer callback1 = 1;
+    final Integer callback2 = 2;
+    final Integer callback3 = 3;
+
+    CallbackRegistry<Integer, CallbackRegistryTest, Integer> registry;
+
+    int notify1;
+    int notify2;
+    int notify3;
+
+    int[] deepNotifyCount = new int[300];
+
+    Integer argValue;
+
+    private void addNotifyCount(Integer callback) {
+        if (callback == callback1) {
+            notify1++;
+        } else if (callback == callback2) {
+            notify2++;
+        } else if (callback == callback3) {
+            notify3++;
+        }
+        deepNotifyCount[callback]++;
+    }
+
+    @Test
+    public void testAddListener() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg, Integer arg2) {
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        Integer callback = 0;
+
+        assertNotNull(registry.copyListeners());
+        assertEquals(0, registry.copyListeners().size());
+
+        registry.add(callback);
+        ArrayList<Integer> callbacks = registry.copyListeners();
+        assertEquals(1, callbacks.size());
+        assertEquals(callback, callbacks.get(0));
+
+        registry.add(callback);
+        callbacks = registry.copyListeners();
+        assertEquals(1, callbacks.size());
+        assertEquals(callback, callbacks.get(0));
+
+        Integer otherListener = 1;
+        registry.add(otherListener);
+        callbacks = registry.copyListeners();
+        assertEquals(2, callbacks.size());
+        assertEquals(callback, callbacks.get(0));
+        assertEquals(otherListener, callbacks.get(1));
+
+        registry.remove(callback);
+        registry.add(callback);
+        callbacks = registry.copyListeners();
+        assertEquals(2, callbacks.size());
+        assertEquals(callback, callbacks.get(1));
+        assertEquals(otherListener, callbacks.get(0));
+    }
+
+    @Test
+    public void testSimpleNotify() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        assertEquals(arg1, (int) arg);
+                        addNotifyCount(callback);
+                        argValue = arg;
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        registry.add(callback2);
+        Integer arg = 1;
+        registry.notifyCallbacks(this, arg, arg);
+        assertEquals(arg, argValue);
+        assertEquals(1, notify2);
+    }
+
+    @Test
+    public void testRemoveWhileNotifying() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                        if (callback == callback1) {
+                            registry.remove(callback1);
+                            registry.remove(callback2);
+                        }
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        registry.add(callback1);
+        registry.add(callback2);
+        registry.add(callback3);
+        registry.notifyCallbacks(this, 0, null);
+        assertEquals(1, notify1);
+        assertEquals(1, notify2);
+        assertEquals(1, notify3);
+
+        ArrayList<Integer> callbacks = registry.copyListeners();
+        assertEquals(1, callbacks.size());
+        assertEquals(callback3, callbacks.get(0));
+    }
+
+    @Test
+    public void testDeepRemoveWhileNotifying() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                        registry.remove(callback);
+                        registry.notifyCallbacks(CallbackRegistryTest.this, arg1, null);
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        registry.add(callback1);
+        registry.add(callback2);
+        registry.add(callback3);
+        registry.notifyCallbacks(this, 0, null);
+        assertEquals(1, notify1);
+        assertEquals(2, notify2);
+        assertEquals(3, notify3);
+
+        ArrayList<Integer> callbacks = registry.copyListeners();
+        assertEquals(0, callbacks.size());
+    }
+
+    @Test
+    public void testAddRemovedListener() {
+
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                        if (callback == callback1) {
+                            registry.remove(callback2);
+                        } else if (callback == callback3) {
+                            registry.add(callback2);
+                        }
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+
+        registry.add(callback1);
+        registry.add(callback2);
+        registry.add(callback3);
+        registry.notifyCallbacks(this, 0, null);
+
+        ArrayList<Integer> callbacks = registry.copyListeners();
+        assertEquals(3, callbacks.size());
+        assertEquals(callback1, callbacks.get(0));
+        assertEquals(callback3, callbacks.get(1));
+        assertEquals(callback2, callbacks.get(2));
+        assertEquals(1, notify1);
+        assertEquals(1, notify2);
+        assertEquals(1, notify3);
+    }
+
+    @Test
+    public void testVeryDeepRemoveWhileNotifying() {
+        final Integer[] callbacks = new Integer[deepNotifyCount.length];
+        for (int i = 0; i < callbacks.length; i++) {
+            callbacks[i] = i;
+        }
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                        registry.remove(callback);
+                        registry.remove(callbacks[callbacks.length - callback - 1]);
+                        registry.notifyCallbacks(CallbackRegistryTest.this, arg1, null);
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        for (int i = 0; i < callbacks.length; i++) {
+            registry.add(callbacks[i]);
+        }
+        registry.notifyCallbacks(this, 0, null);
+        for (int i = 0; i < deepNotifyCount.length; i++) {
+            int expectedCount = Math.min(i + 1, deepNotifyCount.length - i);
+            assertEquals(expectedCount, deepNotifyCount[i]);
+        }
+
+        ArrayList<Integer> callbackList = registry.copyListeners();
+        assertEquals(0, callbackList.size());
+    }
+
+    @Test
+    public void testClear() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        for (int i = 0; i < deepNotifyCount.length; i++) {
+            registry.add(i);
+        }
+        registry.clear();
+
+        ArrayList<Integer> callbackList = registry.copyListeners();
+        assertEquals(0, callbackList.size());
+
+        registry.notifyCallbacks(this, 0, null);
+        for (int i = 0; i < deepNotifyCount.length; i++) {
+            assertEquals(0, deepNotifyCount[i]);
+        }
+    }
+
+    @Test
+    public void testNestedClear() {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg1, Integer arg) {
+                        addNotifyCount(callback);
+                        registry.clear();
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        for (int i = 0; i < deepNotifyCount.length; i++) {
+            registry.add(i);
+        }
+        registry.notifyCallbacks(this, 0, null);
+        for (int i = 0; i < deepNotifyCount.length; i++) {
+            assertEquals(1, deepNotifyCount[i]);
+        }
+
+        ArrayList<Integer> callbackList = registry.copyListeners();
+        assertEquals(0, callbackList.size());
+    }
+
+    @Test
+    public void testIsEmpty() throws Exception {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg, Integer arg2) {
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+        Integer callback = 0;
+
+        assertTrue(registry.isEmpty());
+        registry.add(callback);
+        assertFalse(registry.isEmpty());
+    }
+
+    @Test
+    public void testClone() throws Exception {
+        CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer> notifier =
+                new CallbackRegistry.NotifierCallback<Integer, CallbackRegistryTest, Integer>() {
+                    @Override
+                    public void onNotifyCallback(Integer callback, CallbackRegistryTest sender,
+                            int arg, Integer arg2) {
+                    }
+                };
+        registry = new CallbackRegistry<Integer, CallbackRegistryTest, Integer>(notifier);
+
+        assertTrue(registry.isEmpty());
+        CallbackRegistry<Integer, CallbackRegistryTest, Integer> registry2 = registry.clone();
+        Integer callback = 0;
+        registry.add(callback);
+        assertFalse(registry.isEmpty());
+        assertTrue(registry2.isEmpty());
+        registry2 = registry.clone();
+        assertFalse(registry2.isEmpty());
+    }
+}
\ No newline at end of file
index 731d4e2..a2d1be0 100644 (file)
@@ -59,7 +59,7 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:21.0.2'
     compile 'com.android.support:gridlayout-v7:21.+'
     compile 'com.android.support:cardview-v7:21.+'
-    compile 'com.android.databinding:annotations:0.3-SNAPSHOT'
+    compile 'com.android.databinding:baseLibrary:0.3-SNAPSHOT'
     //provided 'com.android.databinding:compiler:0.3-SNAPSHOT'
     provided 'com.android.databinding:annotationprocessor:0.3-SNAPSHOT'
     provided fileTree(dir : 'build/databinder/src', include : ['*.java'])
index 374e173..f3b2c33 100644 (file)
@@ -1,8 +1,8 @@
-include ':library'
+include ':library', ':baseLibrary'
 include ':compiler'
 include ':gradlePlugin'
-include ':annotations'
-include ':grammerBuilder'
+include ':baseLibrary'
+include ':grammarBuilder'
 include ':annotationprocessor'
-include ':xmlGrammer'
+include ':xmlGrammar'
 include ':TestApp'