diff options
| -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}" |