Drive all tools/base versions from a single file

See I445d0d28cdedd4690dfcbadade2d6ca31e501f7d

Bug: 259300391
Test: Existing
Change-Id: I305c05a7d7374827762d4d707d5aa863fa9e6823

3 files changed, 9 insertions, 17 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index 4ab3bbd5..90b04e24 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,7 +2,7 @@ load("//tools/base/bazel:bazel.bzl", "iml_module")
 load("//tools/base/bazel:kotlin.bzl", "kotlin_library", "kotlin_test")
 load("//tools/base/bazel:utils.bzl", "fileset", "merged_properties")
 load("//tools/base/bazel:gradle.bzl", "gradle_build")
-load("//tools/base/bazel:maven.bzl", "maven_repository", "maven_library")
+load("//tools/base/bazel:maven.bzl", "maven_library", "maven_repository")
 load("//tools/base/bazel:utils.bzl", "java_jarjar", "merged_zip")
 load("//tools/base/common:version.bzl", "BUILD_VERSION")
 
@@ -142,7 +142,7 @@ iml_module(
 merged_properties(
     name = "data_binding_version_info",
     srcs = [
-        "//tools/buildSrc/base:version.properties",
+        "//tools/base/common/version/com/android:version.properties",
         "//tools/data-binding:databinding.properties",
     ],
     mappings = [
@@ -352,7 +352,7 @@ gradle_build(
         "//prebuilts/studio/sdk:platforms/latest",
         "//prebuilts/studio/sdk:platform-tools",
         "//prebuilts/studio/sdk:build-tools/latest",
-        "//tools/buildSrc/base:version.properties",
+        "//tools/base/common:agp_gradle_build_files",
         "//tools/buildSrc/base:dependencies.properties",
         "//tools/data-binding:databinding.properties",
     ] + glob(
@@ -389,7 +389,7 @@ gradle_build(
         "//prebuilts/studio/sdk:platforms/latest",
         "//prebuilts/studio/sdk:platform-tools",
         "//prebuilts/studio/sdk:build-tools/latest",
-        "//tools/buildSrc/base:version.properties",
+        "//tools/base/common:agp_gradle_build_files",
         "//tools/data-binding:databinding.properties",
     ] + glob(
         ["extensions-support/**"],
diff --git a/extensions-support/build.gradle b/extensions-support/build.gradle
index 98da568a..f3bc3df5 100644
--- a/extensions-support/build.gradle
+++ b/extensions-support/build.gradle
@@ -48,7 +48,7 @@ buildscript {
     Properties databindingProperties = new Properties()
     databindingProperties.load(new FileInputStream("$projectDir/../databinding.properties"))
     Properties buildToolsProperties = new Properties()
-    buildToolsProperties.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties"))
+    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/version.bzl"))
 
     def runningInIde = project.hasProperty('android.injected.invoked.from.ide')
     // this is done by bazel but if we are in IDE it also configures so we need to distinguish
@@ -56,18 +56,14 @@ buildscript {
     ext.autoConfigured = autoConfigured
 
 
-    def TOOLS_VERSION = project.providers.environmentVariable("VERSION").orElse(buildToolsProperties.get("buildVersion").toString()).get()
+    def TOOLS_VERSION = project.providers.environmentVariable("VERSION").orElse(buildToolsProperties.get("BUILD_VERSION").toString()).get() - '"' - '"'
     def OUT_REPO = project.providers.environmentVariable("OUT_REPO")
             .orElse(project.providers.environmentVariable("BUILD_DIR"))
             .orNull
     def MAVEN_REPO = project.providers.environmentVariable("MAVEN_REPO").orNull
     def PREBUILTS_REPO = project.providers.environmentVariable("PREBUILTS_REPO").orNull
     if (runningInIde) {
-        Properties devVersions = new Properties()
-        devVersions.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties"))
-        // invoked in the IDE, go w/ defaults.
-        TOOLS_VERSION = devVersions.buildVersion
-        if (TOOLS_VERSION .contains('-')) {
+        if (TOOLS_VERSION.contains('-')) {
             TOOLS_VERSION = TOOLS_VERSION .substring(0, TOOLS_VERSION.indexOf('-')) + "-dev"
         }
         MAVEN_REPO = MAVEN_REPO ?: "${projectDir}/../../../out/repo"
diff --git a/extensions/build.gradle b/extensions/build.gradle
index 4d22ab13..b6fb7a50 100644
--- a/extensions/build.gradle
+++ b/extensions/build.gradle
@@ -50,7 +50,7 @@ buildscript {
     Properties databindingProperties = new Properties()
     databindingProperties.load(new FileInputStream("$projectDir/../databinding.properties"))
     Properties buildToolsProperties = new Properties()
-    buildToolsProperties.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties"))
+    buildToolsProperties.load(new FileInputStream("$projectDir/../../base/common/version.bzl"))
     Properties dependencyProperties = new Properties()
     dependencyProperties.load(new FileInputStream("$projectDir/../../buildSrc/base/dependencies.properties"))
 
@@ -60,15 +60,11 @@ buildscript {
     ext.autoConfigured = autoConfigured
 
     def TOOLS_VERSION =
-            System.getenv("VERSION") ?: buildToolsProperties.get("buildVersion").toString()
+            System.getenv("VERSION") ?: buildToolsProperties.get("BUILD_VERSION").toString() - '"' - '"'
     def OUT_REPO = System.getenv("OUT_REPO") ?: System.getenv("BUILD_DIR")
     def MAVEN_REPO = System.getenv("MAVEN_REPO")
     def PREBUILTS_REPO = System.getenv("PREBUILTS_REPO")
     if (runningInIde) {
-        Properties devVersions = new Properties()
-        devVersions.load(new FileInputStream("$projectDir/../../buildSrc/base/version.properties"))
-        // invoked in the IDE, go w/ defaults.
-        TOOLS_VERSION = devVersions.buildVersion
         if (TOOLS_VERSION .contains('-')) {
             TOOLS_VERSION = TOOLS_VERSION .substring(0, TOOLS_VERSION.indexOf('-')) + "-dev"
         }