Add annotation processor.

5 files changed, 33 insertions, 19 deletions

diff --git a/samples/BindingDemo/app/build.gradle b/samples/BindingDemo/app/build.gradle
index 45e7ebeb..247331c9 100644
--- a/samples/BindingDemo/app/build.gradle
+++ b/samples/BindingDemo/app/build.gradle
@@ -17,6 +17,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.databinding'
 
+def generatedSources = "$buildDir/generated/source/br"
+
 android {
     compileSdkVersion 21
     buildToolsVersion "21.1.1"
@@ -38,6 +40,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    //sourceSets {
+    //    main.java.srcDirs += generatedSources
+    //}
+}
+
+android.applicationVariants.all { variant ->
+    variant.javaCompile.doFirst {
+        println "*** compile doFirst ${variant.name}"
+        new File(generatedSources).mkdirs()
+        variant.javaCompile.options.compilerArgs += [
+                '-s', generatedSources
+        ]
+    }
 }
 
 dependencies {
@@ -47,4 +62,5 @@ dependencies {
     compile 'com.android.support:recyclerview-v7:21.0.2'
     compile 'com.android.support:gridlayout-v7:21+'
     compile 'com.android.support:cardview-v7:21.0.2'
+    provided 'com.android.databinding:annotationprocessor:0.1-SNAPSHOT'
 }
diff --git a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
index 51b1c907..eae8b9b8 100644
--- a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
+++ b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/MainActivity.java
@@ -1,5 +1,6 @@
 package com.android.example.bindingdemo;
 
+import android.binding.Bindable;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
@@ -25,9 +26,13 @@ import java.util.List;
 
 
 public class MainActivity extends ActionBarActivity implements Observable {
+    @Bindable
     UserAdapter tkAdapter;
+    @Bindable
     UserAdapter robotAdapter;
+    @Bindable
     MainActivityBinder dataBinder;
+    @Bindable
     User selected;
     ObservableHelper helper;
 
@@ -67,6 +72,7 @@ public class MainActivity extends ActionBarActivity implements Observable {
         helper.fireChange(BR.selected);
     }
 
+    @Bindable
     public View.OnClickListener onSave = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -78,6 +84,7 @@ public class MainActivity extends ActionBarActivity implements Observable {
         }
     };
 
+    @Bindable
     public View.OnClickListener onUnselect = new View.OnClickListener() {
 
         @Override
@@ -86,6 +93,7 @@ public class MainActivity extends ActionBarActivity implements Observable {
         }
     };
 
+    @Bindable
     public View.OnClickListener onDelete = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
diff --git a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
index 091dc5c3..a7c0c691 100644
--- a/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
+++ b/samples/BindingDemo/app/src/main/java/com/android/example/bindingdemo/vo/User.java
@@ -1,5 +1,6 @@
 package com.android.example.bindingdemo.vo;
 
+import android.binding.Bindable;
 import android.graphics.Color;
 
 import com.android.databinding.library.BaseObservable;
@@ -7,10 +8,15 @@ import com.android.databinding.library.BaseObservable;
 import java.util.Objects;
 
 public class User extends BaseObservable {
+    @Bindable
     private String name;
+    @Bindable
     private String lastName;
+    @Bindable
     private int photoResource = 0;
+    @Bindable
     private int favoriteColor = Color.RED;
+    @Bindable
     private int group;
     public static final int TOOLKITTY = 1;
     public static final int ROBOT = 2;
diff --git a/samples/BindingDemo/build.gradle b/samples/BindingDemo/build.gradle
index 6dad139f..e4abd4e2 100644
--- a/samples/BindingDemo/build.gradle
+++ b/samples/BindingDemo/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.2'
+        classpath 'com.android.tools.build:gradle:1.0.0'
         classpath  'com.android.databinding:dataBinder:0.3-SNAPSHOT'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties b/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties
index ddbd6130..f02c72ae 100644
--- a/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/BindingDemo/gradle/wrapper/gradle-wrapper.properties
@@ -1,22 +1,6 @@
-#
-# 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.
-#
-
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Dec 17 11:22:31 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip