diff options
| author | Yigit Boyar <yboyar@google.com> | 2016-01-22 09:44:59 -0800 |
|---|---|---|
| committer | Yigit Boyar <yboyar@google.com> | 2016-01-25 11:42:45 -0800 |
| commit | 8b8eb28e6a043b6914f8561147ac1a3e7c0bc59d (patch) | |
| tree | 61fb88afd49daf0bd83182f25e301f654216b8f9 | |
| parent | af146d6a8c0efcf5682d14047c06866a5548f78f (diff) | |
| download | data-binding-8b8eb28e6a043b6914f8561147ac1a3e7c0bc59d.tar.gz | |
Sync version with android gradle plugin
This CL starts loading version from android gradle plugin's
configuration file rather than data binding's configuration
file. This might be an issue in the future if we can support
additional build tools but for now, this will help simplfy
integration with tools.
Bug: 26560734
Change-Id: I1ea6f8e4716873b4ea84930e780c47eb7a6079ec
| -rw-r--r-- | databinding.properties | 2 | ||||
| -rw-r--r-- | propLoader.gradle | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/databinding.properties b/databinding.properties index 4b4b62fc..120a93ee 100644 --- a/databinding.properties +++ b/databinding.properties @@ -1,7 +1,5 @@ # global settings for projects kotlinVersion = 1.0.0-beta-4584 -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.5.0 diff --git a/propLoader.gradle b/propLoader.gradle index be1ca974..310d313e 100644 --- a/propLoader.gradle +++ b/propLoader.gradle @@ -1,13 +1,14 @@ /** * Helper build script that reads data binding variables and sets up the projects. */ -def forceReleaseVersion = project.hasProperty('useReleaseVersion') && project.getProperty('useReleaseVersion').equals("true") def root = ext.dataBindingRootFolder Properties databindingProperties = new Properties() databindingProperties.load(new FileInputStream("${root}/databinding.properties")) -if (forceReleaseVersion) { - databindingProperties.version = databindingProperties.releaseVersion -} + +// load android gradle plugin's version file +apply from: "${root}/../buildSrc/base/version.gradle" + +databindingProperties.version = ext.buildVersion databindingProperties.compileSdkVersion = Integer.parseInt(databindingProperties.compileSdkVersionStr) def repoBase = databindingProperties.mavenRepoAbsolutePath == "." ? root : databindingProperties.mavenRepoAbsolutePath databindingProperties.androidGradlePluginRepoDir = "${root}/../../${databindingProperties.androidGradlePluginOutRepo}" |