diff options
| author | Yigit Boyar <yboyar@google.com> | 2015-12-04 14:51:00 -0800 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2015-12-04 14:51:00 -0800 |
| commit | e61d1cc710803cdf0ab4f2aca3d18c46949758a9 (patch) | |
| tree | 785694433870e4284affcbee1b882dbf55cedd3f | |
| parent | 0b6d118e6eeb3bc100fc6a6e66016ab812cb2783 (diff) | |
| download | data-binding-e61d1cc710803cdf0ab4f2aca3d18c46949758a9.tar.gz | |
Fix compiler tests setup, upgrade public known version
Change-Id: I91babbab13cd00d4f0df149c997349fca0aed80b
| -rw-r--r-- | compiler/build.gradle | 2 | ||||
| -rw-r--r-- | compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java | 14 | ||||
| -rw-r--r-- | databinding.properties | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/compiler/build.gradle b/compiler/build.gradle index 1d101731..964a8d8f 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -41,8 +41,6 @@ dependencies { compile 'commons-codec:commons-codec:1.10' compile 'com.tunnelvisionlabs:antlr4:4.5' compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' - testCompile files('../baseLibrary/src/main/java') - testCompile files('../extensions/library/src/main/java') testCompile 'junit:junit:4.12' } diff --git a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java index 198cc03e..92b6b3fa 100644 --- a/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java +++ b/compiler/src/test/java/android/databinding/tool/expr/ExprModelTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import android.databinding.BaseObservable; import android.databinding.Bindable; +import android.databinding.Observable; import android.databinding.tool.LayoutBinder; import android.databinding.tool.MockLayoutBinder; import android.databinding.tool.reflection.ModelAnalyzer; @@ -1002,7 +1002,7 @@ public class ExprModelTest { return mExprModel.filterShouldRead(mExprModel.getPendingExpressions()); } - public static class User extends BaseObservable { + public static class User implements Observable { String name; @@ -1043,6 +1043,16 @@ public class ExprModelTest { return true; } + @Override + public void addOnPropertyChangedCallback(OnPropertyChangedCallback callback) { + + } + + @Override + public void removeOnPropertyChangedCallback(OnPropertyChangedCallback callback) { + + } + public static class InnerStaticClass { public static final int finalField = 3; diff --git a/databinding.properties b/databinding.properties index 191c2693..ab6f8244 100644 --- a/databinding.properties +++ b/databinding.properties @@ -4,7 +4,7 @@ version = 1.1 releaseVersion = 1.1 extensionsVersion = 1.0-rc5 # we use a public plugin so that it does not need data binding while compiling library -androidPublicPluginVersion= 1.4.0-beta2 +androidPublicPluginVersion= 1.5.0 javaTargetCompatibility = 1.6 javaSourceCompatibility = 1.6 buildToolsVersion = 22.0.1 |