diff options
| author | Yigit Boyar <yboyar@google.com> | 2015-03-12 14:30:29 -0700 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2015-03-12 19:27:20 -0700 |
| commit | 1ec5cb07292f043260c9d6d93daac32f8b71b98e (patch) | |
| tree | 41215225bebb334cfffc95b969ea5e34f5604c73 /tools | |
| parent | 0710ff5b5994ccca2fdc716ca6e71cec4805735b (diff) | |
| download | frameworks_base-1ec5cb07292f043260c9d6d93daac32f8b71b98e.zip frameworks_base-1ec5cb07292f043260c9d6d93daac32f8b71b98e.tar.gz frameworks_base-1ec5cb07292f043260c9d6d93daac32f8b71b98e.tar.bz2 | |
Restructure project for test apps
This CL updates project to use a local maven repo.
(local as in near source code w/ relative path).
This is necessary to have multiple versions of the
project on the same computer also provides better
separation.
I also moved integration tests to depend on these
because we cannot build the compiler and test app at
the same project.
I've changed library plugin's jar to be a separate
upload task to avoid some build issues in TestApp
when we release a @jar and @aar with same group and
artifact ids.
This CL also adds some convenience methods to
gradle build script to run all tests, prepare maven
repo, run integration tests etc. These were needed
to do CI.
Bug: 19718690
Change-Id: I3c80e09fe7c8c2780ca00c3e9b9ba99a162531cf
Diffstat (limited to 'tools')
147 files changed, 439 insertions, 94 deletions
diff --git a/tools/data-binding/TestApp/build.gradle b/tools/data-binding/TestApp/build.gradle deleted file mode 100644 index aa4cd0d..0000000 --- a/tools/data-binding/TestApp/build.gradle +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ -buildscript { - repositories { - jcenter() - mavenLocal() - } - dependencies { - classpath "com.android.tools.build:gradle:$androidPluginVersion" - classpath "com.android.databinding:dataBinder:$version" - } -} -apply plugin: 'com.android.application' -apply plugin: 'com.android.databinding' - -repositories { - jcenter() -} - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.0" - - defaultConfig { - applicationId "com.android.databinding.testapp" - minSdkVersion 8 - targetSdkVersion 21 - versionCode 1 - versionName "1.0" - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - packagingOptions { - exclude 'META-INF/services/javax.annotation.processing.Processor' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile project(":library") - compile "com.android.support:support-v4:+" - provided project(":annotationprocessor") -} diff --git a/tools/data-binding/annotationprocessor/build.gradle b/tools/data-binding/annotationprocessor/build.gradle index d0099d6..a639abb 100644 --- a/tools/data-binding/annotationprocessor/build.gradle +++ b/tools/data-binding/annotationprocessor/build.gradle @@ -48,10 +48,7 @@ dependencies { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) - pom.version = '0.3-SNAPSHOT' pom.artifactId = 'annotationprocessor' - pom.groupId='com.android.databinding' } } } diff --git a/tools/data-binding/baseLibrary/build.gradle b/tools/data-binding/baseLibrary/build.gradle index 4e0c991..57d665f 100644 --- a/tools/data-binding/baseLibrary/build.gradle +++ b/tools/data-binding/baseLibrary/build.gradle @@ -53,10 +53,7 @@ dependencies { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) - pom.version = '0.3-SNAPSHOT' pom.artifactId = 'baseLibrary' - pom.groupId='com.android.databinding' } } } diff --git a/tools/data-binding/build.gradle b/tools/data-binding/build.gradle index 18b0ea2..83e5ea8 100644 --- a/tools/data-binding/build.gradle +++ b/tools/data-binding/build.gradle @@ -1,15 +1,61 @@ ext.kotlinVersion = '0.10.195' ext.releaseVersion = "0.3" ext.snapshotVersion = "0.3-SNAPSHOT" -ext.androidPluginVersion = "1.0.0" +ext.androidPluginVersion = "1.0.1" ext.javaTargetCompatibility = 1.6 ext.javaSourceCompatibility = 1.6 - +ext.mavenRepoDir = "${projectDir}/maven-repo" +println "local maven repo is ${ext.mavenRepoDir}." +new File(ext.mavenRepoDir).mkdir() subprojects { + apply plugin: 'maven' group = 'com.android.databinding' version = '0.3-SNAPSHOT' repositories { - mavenLocal() mavenCentral() + maven { + url "file://$mavenRepoDir" + } + } + uploadArchives { + repositories { + mavenDeployer { + repository(url: "file://$mavenRepoDir") + } + } + } +} + +task deleteRepo(type: Delete) { + delete "$mavenRepoDir" +} + +file('integration-tests').listFiles().findAll { it.isDirectory() }.each { + println("${it.getAbsolutePath()}") + def testTask = project.tasks.create "runTestsOf${it.getName().capitalize()}", Exec + testTask.workingDir 'integration-tests/TestApp' + //on linux + testTask.commandLine './gradlew' + testTask.args 'clean', 'connectedCheck', '--info' + testTask.dependsOn subprojects.uploadArchives +} + +task runIntegrationTests { + dependsOn tasks.findAll { task -> task.name.startsWith('runTestsOf') } +} + +task runAllTests { + dependsOn runIntegrationTests +} + +allprojects { + afterEvaluate { project -> + runAllTests.dependsOn project.tasks.findAll {task -> task.name.equals('test')} } +} + + +task rebuildRepo() { + dependsOn deleteRepo + dependsOn subprojects.uploadArchives }
\ No newline at end of file diff --git a/tools/data-binding/compiler/build.gradle b/tools/data-binding/compiler/build.gradle index 1e0f593..778f08f 100644 --- a/tools/data-binding/compiler/build.gradle +++ b/tools/data-binding/compiler/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'java' apply plugin: "kotlin" -apply plugin: 'maven' sourceCompatibility = javaTargetCompatibility @@ -42,7 +41,7 @@ dependencies { compile project(":baseLibrary") compile project(":grammarBuilder") compile project(":xmlGrammar") - testCompile "com.android.databinding:library:$version@jar" + testCompile "com.android.databinding:libraryJar:$version@jar" } task fatJar(type: Jar) { @@ -54,7 +53,11 @@ task fatJar(type: Jar) { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) + pom.artifactId = 'compiler' } } } + +project(':library').afterEvaluate { libProject -> + tasks['compileTestKotlin'].dependsOn libProject.tasks['uploadJarArchives'] +} diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java index a44c8d8..a965086 100644 --- a/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java +++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java @@ -19,6 +19,7 @@ package com.android.databinding.expr; import com.android.databinding.reflection.ModelAnalyzer; import com.android.databinding.reflection.Callable; import com.android.databinding.reflection.ModelClass; +import com.android.databinding.util.L; import java.util.List; @@ -97,7 +98,10 @@ public class FieldAccessExpr extends Expr { Expr child = getChild(); child.resolveType(modelAnalyzer); boolean isStatic = child instanceof StaticIdentifierExpr; - mGetter = modelAnalyzer.findMethodOrField(child.getResolvedType(), mName, isStatic); + ModelClass resolvedType = child.getResolvedType(); + L.d("resolving %s. Resolved type: %s", this, resolvedType); + + mGetter = modelAnalyzer.findMethodOrField(resolvedType, mName, isStatic); if (modelAnalyzer.isObservableField(mGetter.resolvedType)) { // Make this the ".get()" and add an extra field access for the observable field child.getParents().remove(this); diff --git a/tools/data-binding/compiler/src/main/java/com/android/databinding/reflection/annotation/AnnotationAnalyzer.java b/tools/data-binding/compiler/src/main/java/com/android/databinding/reflection/annotation/AnnotationAnalyzer.java index c6e3388..5493888 100644 --- a/tools/data-binding/compiler/src/main/java/com/android/databinding/reflection/annotation/AnnotationAnalyzer.java +++ b/tools/data-binding/compiler/src/main/java/com/android/databinding/reflection/annotation/AnnotationAnalyzer.java @@ -15,6 +15,7 @@ */ package com.android.databinding.reflection.annotation; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.android.databinding.reflection.Callable; @@ -244,6 +245,8 @@ public class AnnotationAnalyzer extends ModelAnalyzer { @Override public Callable findMethodOrField(ModelClass modelClass, String name, boolean staticAccess) { + Preconditions.checkNotNull(modelClass, "trying to find method %s on empty mode class.", + name); AnnotationClass annotationClass = (AnnotationClass) modelClass; for (String methodName : new String[]{"get" + StringUtils.capitalize(name), diff --git a/tools/data-binding/gradle/wrapper/gradle-wrapper.properties b/tools/data-binding/gradle/wrapper/gradle-wrapper.properties index e533849..e5fd879 100644 --- a/tools/data-binding/gradle/wrapper/gradle-wrapper.properties +++ b/tools/data-binding/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Feb 02 17:44:27 PST 2015 +#Thu Mar 12 15:27:48 PDT 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/tools/data-binding/gradlePlugin/build.gradle b/tools/data-binding/gradlePlugin/build.gradle index 0579516..eb71d35 100644 --- a/tools/data-binding/gradlePlugin/build.gradle +++ b/tools/data-binding/gradlePlugin/build.gradle @@ -41,7 +41,6 @@ dependencies { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) pom.artifactId = 'dataBinder' } } diff --git a/tools/data-binding/grammarBuilder/build.gradle b/tools/data-binding/grammarBuilder/build.gradle index 17e9c4b..6a6274e 100644 --- a/tools/data-binding/grammarBuilder/build.gradle +++ b/tools/data-binding/grammarBuilder/build.gradle @@ -49,7 +49,6 @@ dependencies { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) pom.artifactId = 'grammarBuilder' } } diff --git a/tools/data-binding/integration-tests/TestApp/.gitignore b/tools/data-binding/integration-tests/TestApp/.gitignore new file mode 100644 index 0000000..afbdab3 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/tools/data-binding/TestApp/.gitignore b/tools/data-binding/integration-tests/TestApp/app/.gitignore index 796b96d..796b96d 100644 --- a/tools/data-binding/TestApp/.gitignore +++ b/tools/data-binding/integration-tests/TestApp/app/.gitignore diff --git a/tools/data-binding/integration-tests/TestApp/app/build.gradle b/tools/data-binding/integration-tests/TestApp/app/build.gradle new file mode 100644 index 0000000..8ba8f39 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/app/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.application' +apply plugin: 'com.android.databinding' + +android { + compileSdkVersion 21 + buildToolsVersion "22" + + defaultConfig { + applicationId "com.android.databinding.testapp" + minSdkVersion 7 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + packagingOptions { + exclude 'META-INF/services/javax.annotation.processing.Processor' + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile "com.android.databinding:library:$snapshotVersion" + compile "com.android.support:support-v4:+" + provided "com.android.databinding:annotationprocessor:$snapshotVersion" +} diff --git a/tools/data-binding/TestApp/proguard-rules.pro b/tools/data-binding/integration-tests/TestApp/app/proguard-rules.pro index 2913b9d..b7210d1 100644 --- a/tools/data-binding/TestApp/proguard-rules.pro +++ b/tools/data-binding/integration-tests/TestApp/app/proguard-rules.pro @@ -1,6 +1,6 @@ # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified -# in /Users/yboyar/android/local-sdk/android-sdk_eng.yboyar_mac-x86/tools/proguard/proguard-android.txt +# in /Users/yboyar/android/sdk/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the proguardFiles # directive in build.gradle. # diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/library/DataBinderTrojan.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/library/DataBinderTrojan.java index eeba4f2..eeba4f2 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/library/DataBinderTrojan.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/library/DataBinderTrojan.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsListViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsListViewBindingAdapterTest.java index 0217e90..4c6b037 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsListViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsListViewBindingAdapterTest.java @@ -20,6 +20,7 @@ import com.android.databinding.testapp.vo.AbsListViewBindingObject; import android.graphics.drawable.ColorDrawable; import android.os.Build; +import android.os.Debug; import android.widget.ListView; public class AbsListViewBindingAdapterTest diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsSeekBarBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsSeekBarBindingAdapterTest.java index abf842b..abf842b 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsSeekBarBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsSeekBarBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsSpinnerBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsSpinnerBindingAdapterTest.java index 7478672..7478672 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AbsSpinnerBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AbsSpinnerBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ApplicationTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ApplicationTest.java index e1bbd42..e1bbd42 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ApplicationTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ApplicationTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AutoCompleteTextViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AutoCompleteTextViewBindingAdapterTest.java index ba7b4de..ba7b4de 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/AutoCompleteTextViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/AutoCompleteTextViewBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseDataBinderTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseDataBinderTest.java index 80c2c94..80c2c94 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseDataBinderTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseDataBinderTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseLandDataBinderTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseLandDataBinderTest.java index 0f983eb..0f983eb 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseLandDataBinderTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseLandDataBinderTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseObservableTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseObservableTest.java index a740551..a740551 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BaseObservableTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BaseObservableTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BasicBindingTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BasicBindingTest.java index a7ba223..a7ba223 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BasicBindingTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BasicBindingTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BasicDependantBindingTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BasicDependantBindingTest.java index 3a7631b..3a7631b 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BasicDependantBindingTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BasicDependantBindingTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindToFinalFieldTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindToFinalFieldTest.java index 96ac989..96ac989 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindToFinalFieldTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindToFinalFieldTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindToFinalObservableFieldTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindToFinalObservableFieldTest.java index c0aacd0..c0aacd0 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindToFinalObservableFieldTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindToFinalObservableFieldTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindingAdapterTestBase.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindingAdapterTestBase.java index bedfc00..bedfc00 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BindingAdapterTestBase.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BindingAdapterTestBase.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BracketTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BracketTest.java index a6dea10..a6dea10 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/BracketTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/BracketTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CastTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CastTest.java index 0ea053f..0ea053f 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CastTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CastTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CheckedTextViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CheckedTextViewBindingAdapterTest.java index ee88e6b..ee88e6b 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CheckedTextViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CheckedTextViewBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CompoundButtonBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CompoundButtonBindingAdapterTest.java index 6570f87..6570f87 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/CompoundButtonBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/CompoundButtonBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ConditionalBindingTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ConditionalBindingTest.java index 4a39680..4a39680 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ConditionalBindingTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ConditionalBindingTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/FindMethodTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/FindMethodTest.java index 4f19701..4f19701 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/FindMethodTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/FindMethodTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/FrameLayoutBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/FrameLayoutBindingAdapterTest.java index 4f1a013..4f1a013 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/FrameLayoutBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/FrameLayoutBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ImageViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ImageViewBindingAdapterTest.java index 1a23bc6..1a23bc6 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ImageViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ImageViewBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/IncludeTagTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/IncludeTagTest.java index 7cff11f..7cff11f 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/IncludeTagTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/IncludeTagTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/LandDataBinderTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/LandDataBinderTest.java index 218c799..218c799 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/LandDataBinderTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/LandDataBinderTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/LinearLayoutBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/LinearLayoutBindingAdapterTest.java index 3b44841..3b44841 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/LinearLayoutBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/LinearLayoutBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ListChangeRegistryTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ListChangeRegistryTest.java index 9a25082..9a25082 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ListChangeRegistryTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ListChangeRegistryTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/MapChangeRegistryTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/MapChangeRegistryTest.java index 1db9f51..1db9f51 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/MapChangeRegistryTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/MapChangeRegistryTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/NewApiTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/NewApiTest.java index 9b28237..9b28237 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/NewApiTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/NewApiTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/NoIdTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/NoIdTest.java index 93ed941..93ed941 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/NoIdTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/NoIdTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableArrayListTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableArrayListTest.java index a8d2f00..a8d2f00 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableArrayListTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableArrayListTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableArrayMapTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableArrayMapTest.java index e793a02..e793a02 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableArrayMapTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableArrayMapTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java index 5529696..5529696 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableFieldTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObjectTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableWithNotBindableFieldObjectTest.java index 31ea135..2a8c377 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObjectTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ObservableWithNotBindableFieldObjectTest.java @@ -11,7 +11,7 @@ * limitations under the License. */ -package com.android.databinding.testapp.com.android.databinding.testapp.vo; +package com.android.databinding.testapp; import com.android.databinding.testapp.BaseDataBinderTest; import com.android.databinding.testapp.R; diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ProcessBindableTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ProcessBindableTest.java index e7f430e..e7f430e 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ProcessBindableTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ProcessBindableTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ProgressBarBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ProgressBarBindingAdapterTest.java index 86726b7..86726b7 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ProgressBarBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ProgressBarBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/PropertyChangeRegistryTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/PropertyChangeRegistryTest.java index 7b6197c..7b6197c 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/PropertyChangeRegistryTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/PropertyChangeRegistryTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/RadioGroupBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/RadioGroupBindingAdapterTest.java index c4bbc4c..c4bbc4c 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/RadioGroupBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/RadioGroupBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ResourceTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ResourceTest.java index 2770c46..2770c46 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ResourceTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ResourceTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/SpinnerBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/SpinnerBindingAdapterTest.java index 50727b0..50727b0 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/SpinnerBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/SpinnerBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/SwitchBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/SwitchBindingAdapterTest.java index 2d136a6..2d136a6 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/SwitchBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/SwitchBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TabWidgetBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TabWidgetBindingAdapterTest.java index af0a74e..af0a74e 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TabWidgetBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TabWidgetBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TableLayoutBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TableLayoutBindingAdapterTest.java index 06d4d2c..06d4d2c 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TableLayoutBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TableLayoutBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TextViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TextViewBindingAdapterTest.java index a026910..a026910 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/TextViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/TextViewBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewBindingAdapterTest.java index 4bde05c..4bde05c 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewGroupBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewGroupBindingAdapterTest.java index acc7b01..acc7b01 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewGroupBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewGroupBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewStubBindingAdapterTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewStubBindingAdapterTest.java index c30ec20..c30ec20 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/ViewStubBindingAdapterTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/ViewStubBindingAdapterTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/multiconfig/LandscapeConfigTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/multiconfig/LandscapeConfigTest.java index f171321..f171321 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/multiconfig/LandscapeConfigTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/multiconfig/LandscapeConfigTest.java diff --git a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/multiconfig/PortraitConfigTest.java b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/multiconfig/PortraitConfigTest.java index 8790f04..8790f04 100644 --- a/tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/multiconfig/PortraitConfigTest.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/androidTest/java/com/android/databinding/testapp/multiconfig/PortraitConfigTest.java diff --git a/tools/data-binding/TestApp/src/main/AndroidManifest.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/AndroidManifest.xml index ae2581a..ae2581a 100644 --- a/tools/data-binding/TestApp/src/main/AndroidManifest.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/AndroidManifest.xml diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/TestActivity.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/TestActivity.java index fa9dd42..fa9dd42 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/TestActivity.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/TestActivity.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsListViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsListViewBindingObject.java index ff0bfbd..ff0bfbd 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsListViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsListViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsSeekBarBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsSeekBarBindingObject.java index bc62445..bc62445 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsSeekBarBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsSeekBarBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsSpinnerBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsSpinnerBindingObject.java index 6e35436..6e35436 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AbsSpinnerBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AbsSpinnerBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AutoCompleteTextViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AutoCompleteTextViewBindingObject.java index 66e2003..66e2003 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/AutoCompleteTextViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/AutoCompleteTextViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/BindableTestObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/BindableTestObject.java index 63ef9c1..63ef9c1 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/BindableTestObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/BindableTestObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/BindingAdapterBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/BindingAdapterBindingObject.java index bd93070..bd93070 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/BindingAdapterBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/BindingAdapterBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/CheckedTextViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/CheckedTextViewBindingObject.java index 6dc3dad..6dc3dad 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/CheckedTextViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/CheckedTextViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/CompoundButtonBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/CompoundButtonBindingObject.java index 80052f4..80052f4 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/CompoundButtonBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/CompoundButtonBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObject.java index 1cf9b09..1cf9b09 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObjectBase.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObjectBase.java index 142a3fe..142a3fe 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObjectBase.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FindMethodBindingObjectBase.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FrameLayoutBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FrameLayoutBindingObject.java index 788c53c..788c53c 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/FrameLayoutBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/FrameLayoutBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ImageViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ImageViewBindingObject.java index 73990d3..73990d3 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ImageViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ImageViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/LinearLayoutBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/LinearLayoutBindingObject.java index 1755fe8..1755fe8 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/LinearLayoutBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/LinearLayoutBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/NotBindableVo.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/NotBindableVo.java index a8ec026..a8ec026 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/NotBindableVo.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/NotBindableVo.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java index 651a8cf..651a8cf 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ObservableFieldBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObject.java index 1128421..1128421 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ObservableWithNotBindableFieldObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ProgressBarBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ProgressBarBindingObject.java index 189b388..189b388 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ProgressBarBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ProgressBarBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/PublicFinalTestVo.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/PublicFinalTestVo.java index 118717c..118717c 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/PublicFinalTestVo.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/PublicFinalTestVo.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/PublicFinalWithObservableTestVo.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/PublicFinalWithObservableTestVo.java index dd415de..dd415de 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/PublicFinalWithObservableTestVo.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/PublicFinalWithObservableTestVo.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/RadioGroupBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/RadioGroupBindingObject.java index 1ddcb2f..1ddcb2f 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/RadioGroupBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/RadioGroupBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/SpinnerBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/SpinnerBindingObject.java index 39b07f5..39b07f5 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/SpinnerBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/SpinnerBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/SwitchBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/SwitchBindingObject.java index 1097b8e..1097b8e 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/SwitchBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/SwitchBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TabWidgetBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TabWidgetBindingObject.java index d4937a5..d4937a5 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TabWidgetBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TabWidgetBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TableLayoutBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TableLayoutBindingObject.java index ab45800..ab45800 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TableLayoutBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TableLayoutBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TextViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TextViewBindingObject.java index b98ded2..b98ded2 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/TextViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/TextViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewBindingObject.java index 8486382..8486382 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewGroupBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewGroupBindingObject.java index f0ee752..f0ee752 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewGroupBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewGroupBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewStubBindingObject.java b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewStubBindingObject.java index 5b0774f..5b0774f 100644 --- a/tools/data-binding/TestApp/src/main/java/com/android/databinding/testapp/vo/ViewStubBindingObject.java +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/java/com/android/databinding/testapp/vo/ViewStubBindingObject.java diff --git a/tools/data-binding/TestApp/src/main/res/drawable-hdpi/ic_launcher.png b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex 96a442e..96a442e 100644 --- a/tools/data-binding/TestApp/src/main/res/drawable-hdpi/ic_launcher.png +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tools/data-binding/TestApp/src/main/res/drawable-mdpi/ic_launcher.png b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 359047d..359047d 100644 --- a/tools/data-binding/TestApp/src/main/res/drawable-mdpi/ic_launcher.png +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tools/data-binding/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 71c6d76..71c6d76 100644 --- a/tools/data-binding/TestApp/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/tools/data-binding/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex 4df1894..4df1894 100644 --- a/tools/data-binding/TestApp/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/tools/data-binding/TestApp/src/main/res/layout-land/multi_res_layout.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml index caf0389..caf0389 100644 --- a/tools/data-binding/TestApp/src/main/res/layout-land/multi_res_layout.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout-land/multi_res_layout.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/abs_list_view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_list_view_adapter_test.xml index 5f81f37..5f81f37 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/abs_list_view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_list_view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/abs_seek_bar_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_seek_bar_adapter_test.xml index ee1e645..ee1e645 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/abs_seek_bar_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_seek_bar_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/abs_spinner_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_spinner_adapter_test.xml index 840eb04..840eb04 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/abs_spinner_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/abs_spinner_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/auto_complete_text_view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/auto_complete_text_view_adapter_test.xml index 9bbbe81..9bbbe81 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/auto_complete_text_view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/auto_complete_text_view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/basic_binding.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/basic_binding.xml index d59f1d0..d59f1d0 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/basic_binding.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/basic_binding.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/basic_dependant_binding.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/basic_dependant_binding.xml index f6478c1..f6478c1 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/basic_dependant_binding.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/basic_dependant_binding.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/bind_to_final.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bind_to_final.xml index 4bf6263..4bf6263 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/bind_to_final.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bind_to_final.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/bind_to_final_observable.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bind_to_final_observable.xml index 38c7cc2..38c7cc2 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/bind_to_final_observable.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bind_to_final_observable.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/bracket_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bracket_test.xml index 07a99d1..07a99d1 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/bracket_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/bracket_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/cast_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/cast_test.xml index e8d3c48..e8d3c48 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/cast_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/cast_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/checked_text_view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/checked_text_view_adapter_test.xml index 431418b..431418b 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/checked_text_view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/checked_text_view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/compound_button_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/compound_button_adapter_test.xml index 021b3e6..021b3e6 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/compound_button_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/compound_button_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/conditional_binding.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/conditional_binding.xml index f8d3012..f8d3012 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/conditional_binding.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/conditional_binding.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/find_method_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/find_method_test.xml index 25c8c91..25c8c91 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/find_method_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/find_method_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/frame_layout_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/frame_layout_adapter_test.xml index 253287b..253287b 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/frame_layout_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/frame_layout_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/image_view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/image_view_adapter_test.xml index c79c8fc..c79c8fc 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/image_view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/image_view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/included_layout.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/included_layout.xml index 8402154..8402154 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/included_layout.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/included_layout.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/layout_with_include.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/layout_with_include.xml index 626f981..626f981 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/layout_with_include.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/layout_with_include.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/linear_layout_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/linear_layout_adapter_test.xml index f5775a0..f5775a0 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/linear_layout_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/linear_layout_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/multi_res_layout.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml index 1d153ed..1d153ed 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/multi_res_layout.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/multi_res_layout.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/new_api_layout.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/new_api_layout.xml index 686676b..686676b 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/new_api_layout.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/new_api_layout.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/no_id_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/no_id_test.xml index ec513ea..ec513ea 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/no_id_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/no_id_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/observable_field_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/observable_field_test.xml index 61dff3e..61dff3e 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/observable_field_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/observable_field_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/observable_with_not_bindable_field.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/observable_with_not_bindable_field.xml index 5f27399..5f27399 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/observable_with_not_bindable_field.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/observable_with_not_bindable_field.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/progress_bar_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/progress_bar_adapter_test.xml index 0ccd17f..0ccd17f 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/progress_bar_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/progress_bar_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/radio_group_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/radio_group_adapter_test.xml index da20f3d..da20f3d 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/radio_group_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/radio_group_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/resource_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/resource_test.xml index dd59771..dd59771 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/resource_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/resource_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/spinner_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/spinner_adapter_test.xml index 1c50b2e..1c50b2e 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/spinner_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/spinner_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/switch_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/switch_adapter_test.xml index 6989d16..6989d16 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/switch_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/switch_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/tab_widget_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/tab_widget_adapter_test.xml index fcb9995..fcb9995 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/tab_widget_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/tab_widget_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/table_layout_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/table_layout_adapter_test.xml index 112dc9c..112dc9c 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/table_layout_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/table_layout_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/text_view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/text_view_adapter_test.xml index c030cc7..c030cc7 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/text_view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/text_view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/view_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_adapter_test.xml index 037869f..037869f 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/view_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/view_group_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_group_adapter_test.xml index 36f9dca..36f9dca 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/view_group_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_group_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/layout/view_stub_adapter_test.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_stub_adapter_test.xml index 3011883..3011883 100644 --- a/tools/data-binding/TestApp/src/main/res/layout/view_stub_adapter_test.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/layout/view_stub_adapter_test.xml diff --git a/tools/data-binding/TestApp/src/main/res/values-v21/styles.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values-v21/styles.xml index 0a2c6be..0a2c6be 100644 --- a/tools/data-binding/TestApp/src/main/res/values-v21/styles.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values-v21/styles.xml diff --git a/tools/data-binding/TestApp/src/main/res/values/fractions.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/fractions.xml index 8817316..8817316 100644 --- a/tools/data-binding/TestApp/src/main/res/values/fractions.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/fractions.xml diff --git a/tools/data-binding/TestApp/src/main/res/values/strings.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/strings.xml index e53e327..e53e327 100644 --- a/tools/data-binding/TestApp/src/main/res/values/strings.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/strings.xml diff --git a/tools/data-binding/TestApp/src/main/res/values/styles.xml b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/styles.xml index c0d5471..c0d5471 100644 --- a/tools/data-binding/TestApp/src/main/res/values/styles.xml +++ b/tools/data-binding/integration-tests/TestApp/app/src/main/res/values/styles.xml diff --git a/tools/data-binding/integration-tests/TestApp/build.gradle b/tools/data-binding/integration-tests/TestApp/build.gradle new file mode 100644 index 0000000..c603029 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/build.gradle @@ -0,0 +1,29 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +ext { + snapshotVersion = "0.3-SNAPSHOT" + androidPluginVersion = "1.0.0" +} + +buildscript { + repositories { + jcenter() + maven { + url "$projectDir/../../maven-repo" + } + } + dependencies { + classpath 'com.android.tools.build:gradle:1.1.3' + 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 + } +} + +allprojects { + repositories { + jcenter() + maven { + url "$projectDir/../../../maven-repo" + } + } +} diff --git a/tools/data-binding/integration-tests/TestApp/gradle.properties b/tools/data-binding/integration-tests/TestApp/gradle.properties new file mode 100644 index 0000000..1d3591c --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true
\ No newline at end of file diff --git a/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.jar b/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..8c0fb64 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.jar diff --git a/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties b/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c71e76 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/tools/data-binding/integration-tests/TestApp/gradlew b/tools/data-binding/integration-tests/TestApp/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/tools/data-binding/integration-tests/TestApp/gradlew.bat b/tools/data-binding/integration-tests/TestApp/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/tools/data-binding/integration-tests/TestApp/settings.gradle b/tools/data-binding/integration-tests/TestApp/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/tools/data-binding/integration-tests/TestApp/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/tools/data-binding/library/build.gradle b/tools/data-binding/library/build.gradle index 229d3e1..dc58151 100644 --- a/tools/data-binding/library/build.gradle +++ b/tools/data-binding/library/build.gradle @@ -18,9 +18,7 @@ buildscript { repositories { - mavenLocal() jcenter() - mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:$androidPluginVersion" @@ -65,6 +63,12 @@ dependencies { provided 'com.android.support:cardview-v7:+' provided 'com.android.support:appcompat-v7:+' } + +configurations { + jarArchives +} + + //create jar tasks android.libraryVariants.all { variant -> def name = variant.buildType.name @@ -76,13 +80,23 @@ android.libraryVariants.all { variant -> def task = project.tasks.create "jar${name.capitalize()}", Jar task.dependsOn variant.javaCompile task.from variant.javaCompile.destinationDir - artifacts.add('archives', task); + artifacts.add('jarArchives', task); } uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) pom.artifactId = 'library' } } } + +uploadJarArchives { + repositories { + mavenDeployer { + repository(url: "file://$mavenRepoDir") + pom.artifactId = "libraryJar" + } + } +} + +uploadArchives.dependsOn uploadJarArchives
\ No newline at end of file diff --git a/tools/data-binding/samples/BindingDemo/build.gradle b/tools/data-binding/samples/BindingDemo/build.gradle index 63cc83a..18f0f56 100644 --- a/tools/data-binding/samples/BindingDemo/build.gradle +++ b/tools/data-binding/samples/BindingDemo/build.gradle @@ -18,7 +18,9 @@ buildscript { repositories { jcenter() - mavenLocal() + maven { + url "$projectDir/../../maven-repo" + } mavenCentral() } dependencies { @@ -32,7 +34,9 @@ buildscript { allprojects { repositories { jcenter() - mavenLocal() + maven { + url "$projectDir/../../../maven-repo" + } mavenCentral() } } diff --git a/tools/data-binding/settings.gradle b/tools/data-binding/settings.gradle index a65f037..c790623 100644 --- a/tools/data-binding/settings.gradle +++ b/tools/data-binding/settings.gradle @@ -1,8 +1,7 @@ +include ':baseLibrary' include ':library' include ':compiler' include ':gradlePlugin' -include ':baseLibrary' include ':grammarBuilder' include ':annotationprocessor' include ':xmlGrammar' -include ':TestApp' diff --git a/tools/data-binding/xmlGrammar/build.gradle b/tools/data-binding/xmlGrammar/build.gradle index ea0d5f0..2e5042c 100644 --- a/tools/data-binding/xmlGrammar/build.gradle +++ b/tools/data-binding/xmlGrammar/build.gradle @@ -37,7 +37,6 @@ dependencies { uploadArchives { repositories { mavenDeployer { - repository(url: mavenLocal().url) pom.artifactId = 'xmlGrammer' } } |
