diff options
author | Yigit Boyar <yboyar@google.com> | 2015-07-09 10:51:54 -0700 |
---|---|---|
committer | Yigit Boyar <yboyar@google.com> | 2015-07-14 16:52:35 -0700 |
commit | 24bec1cc542de69e0e21cc774469f20d34811ad9 (patch) | |
tree | 4709494d783cec648090ac30c59af03fd56aed88 /compilationTests | |
parent | 070c9f6208e036b6656446d36746d97cad541d21 (diff) | |
download | data-binding-24bec1cc542de69e0e21cc774469f20d34811ad9.tar.gz |
Localize Maven
This CL introduces a new development plugin that downloads all
dependencies into the given repository. This will allow us to
build data binding in build servers w/o internet connection.
By default, it is setup to disable public repositories to avoid
adding a new dependency w/o running the script.
Public repositories can be added by running -PaddRemoteRepos=true.
There is also a convenience script to fetch dependencies.
localize.sh
Bug: 19626302
Change-Id: I9d200550b76c3b60119cdbbdb4e1e7772d0da1d7
Diffstat (limited to 'compilationTests')
5 files changed, 15 insertions, 24 deletions
diff --git a/compilationTests/build.gradle b/compilationTests/build.gradle index e8b56dd9..743050cd 100644 --- a/compilationTests/build.gradle +++ b/compilationTests/build.gradle @@ -3,12 +3,8 @@ apply plugin: 'java' sourceCompatibility = 1.7 version = '1.0' -repositories { - mavenCentral() -} - dependencies { - testCompile group: 'junit', name: 'junit', version: '4.11' + testCompile group: 'junit', name: 'junit', version: '4.12' testCompile 'org.apache.commons:commons-lang3:3.3.2' testCompile 'commons-io:commons-io:2.4' testCompile 'commons-codec:commons-codec:1.10' diff --git a/compilationTests/src/test/java/android/databinding/compilationTest/BaseCompilationTest.java b/compilationTests/src/test/java/android/databinding/compilationTest/BaseCompilationTest.java index c9cf2a08..814f4aa2 100644 --- a/compilationTests/src/test/java/android/databinding/compilationTest/BaseCompilationTest.java +++ b/compilationTests/src/test/java/android/databinding/compilationTest/BaseCompilationTest.java @@ -216,6 +216,7 @@ public class BaseCompilationTest { if (localProperties.exists()) { FileUtils.copyFile(localProperties, new File(testFolder, "local.properties")); } + FileUtils.copyFile(new File("../propLoader.gradle"), new File(testFolder, "propLoaderClone.gradle")); FileUtils.copyFile(new File("../gradlew"), new File(testFolder, "gradlew")); FileUtils.copyDirectory(new File("../gradle"), new File(testFolder, "gradle")); } diff --git a/compilationTests/src/test/java/android/databinding/compilationTest/CompilationResult.java b/compilationTests/src/test/java/android/databinding/compilationTest/CompilationResult.java index f50755bd..f6d1f5ec 100644 --- a/compilationTests/src/test/java/android/databinding/compilationTest/CompilationResult.java +++ b/compilationTests/src/test/java/android/databinding/compilationTest/CompilationResult.java @@ -47,7 +47,7 @@ public class CompilationResult { if (errors.isEmpty()) { return null; } - assertEquals(1, errors.size()); + assertEquals(error, 1, errors.size()); return errors.get(0); } diff --git a/compilationTests/src/test/java/android/databinding/compilationTest/SimpleCompilationTest.java b/compilationTests/src/test/java/android/databinding/compilationTest/SimpleCompilationTest.java index e627c99f..43efbb81 100644 --- a/compilationTests/src/test/java/android/databinding/compilationTest/SimpleCompilationTest.java +++ b/compilationTests/src/test/java/android/databinding/compilationTest/SimpleCompilationTest.java @@ -52,7 +52,7 @@ public class SimpleCompilationTest extends BaseCompilationTest { public void testEmptyCompilation() throws IOException, URISyntaxException, InterruptedException { prepareProject(); CompilationResult result = runGradle("assembleDebug"); - assertEquals(0, result.resultCode); + assertEquals(result.error, 0, result.resultCode); assertTrue("there should not be any errors " + result.error, StringUtils.isEmpty(result.error)); assertTrue("Test sanity, should compile fine", result.resultContainsText("BUILD SUCCESSFUL")); @@ -94,9 +94,9 @@ public class SimpleCompilationTest extends BaseCompilationTest { copyResourceTo("/layout/invalid_setter_binding.xml", "/app/src/main/res/layout/invalid_setter.xml"); CompilationResult result = runGradle("assembleDebug"); - assertNotEquals(0, result.resultCode); + assertNotEquals(result.output, 0, result.resultCode); List<ScopedException> bindingExceptions = result.getBindingExceptions(); - assertEquals(2, bindingExceptions.size()); + assertEquals(result.error, 2, bindingExceptions.size()); File broken = new File(testFolder, "/app/src/main/res/layout/broken.xml"); File invalidSetter = new File(testFolder, "/app/src/main/res/layout/invalid_setter.xml"); for (ScopedException exception : bindingExceptions) { diff --git a/compilationTests/src/test/resources/project_build.gradle b/compilationTests/src/test/resources/project_build.gradle index b8597551..fcf1b754 100644 --- a/compilationTests/src/test/resources/project_build.gradle +++ b/compilationTests/src/test/resources/project_build.gradle @@ -1,24 +1,18 @@ buildscript { - def Properties dataBindingProperties = new Properties() - dataBindingProperties.load(new FileInputStream("${projectDir}/../../../databinding.properties")) - dataBindingProperties.mavenRepoDir = "${projectDir}/../../../${dataBindingProperties.mavenRepoName}" - ext.config = dataBindingProperties - println "loaded config" - - repositories { - jcenter() - maven { - url config.mavenRepoDir - } - } + ext.rootFolder = new File(project.projectDir, "../../..") + apply from: "${project.projectDir}/propLoaderClone.gradle" + ext.addRepos(repositories) dependencies { - classpath "com.android.tools.build:gradle:${config.androidPluginVersion}" classpath "com.android.databinding:dataBinder:${config.version}" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files } } +subprojects { + apply plugin: 'maven' + group = config.group + version = config.version +} + allprojects { repositories { jcenter() |