Snap for 9430025 from b4743bea1b3d7422f6441769e71a0d8abcb74029 to studio-giraffe-releasestudio-2022.3.1-canary1

Change-Id: Id234e5dbac5d5345fb48630d9fd6c2c27b9fd83e

10 files changed, 17 insertions, 13 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index 90b04e24..ff6dd8b9 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -41,22 +41,24 @@ iml_module(
 maven_library(
     name = "tools.baseLibrary",
     srcs = glob(["baseLibrary/src/main/java/**"]),
-    coordinates = "androidx.databinding:databinding-common:" + BUILD_VERSION,
+    coordinates = "androidx.databinding:databinding-common",
     description = "Shared library between Data Binding runtime lib and compiler",
     javacopts = ["--release 8"],
     notice = "baseLibrary/NOTICE",
     resource_strip_prefix = "tools/data-binding/baseLibrary",
+    version = BUILD_VERSION,
     visibility = ["//visibility:public"],
 )
 
 maven_library(
     name = "tools.baseLibrarySupport",
     srcs = glob(["baseLibrarySupport/src/main/java/**"]),
-    coordinates = "com.android.databinding:baseLibrary:" + BUILD_VERSION,
+    coordinates = "com.android.databinding:baseLibrary",
     description = "Shared library between Data Binding runtime lib and compiler",
     javacopts = ["--release 8"],
     notice = "baseLibrary/NOTICE",
     resource_strip_prefix = "tools/data-binding/baseLibrary",
+    version = BUILD_VERSION,
     visibility = ["//visibility:public"],
 )
 
@@ -175,12 +177,13 @@ maven_library(
         ":compilerCommon.antlr_runtime.shaded",
         ":compilerCommon.antlr.shaded",
     ],
-    coordinates = "androidx.databinding:databinding-compiler-common:" + BUILD_VERSION,
+    coordinates = "androidx.databinding:databinding-compiler-common",
     description = "Common library that can be shared between different build tools",
     module_name = "databinding-compiler-common",
     notice = "compilerCommon/NOTICE",
     resource_strip_prefix = "tools/data-binding",
     resources = [":tools.compilerCommon.resources"],
+    version = BUILD_VERSION,
     visibility = ["//visibility:public"],
     deps = [
         ":tools.baseLibrary",
@@ -265,7 +268,7 @@ maven_library(
         "compiler/src/main/java/**/*.kt",
         "compiler/src/main/kotlin/**/*.kt",
     ]),
-    coordinates = "androidx.databinding:databinding-compiler:" + BUILD_VERSION,
+    coordinates = "androidx.databinding:databinding-compiler",
     description = "The annotation processor for Data Binding. Generates binding classes for runtime.",
     module_name = "databinding-compiler",
     notice = "compiler/src/main/resources/NOTICE.txt",
@@ -274,6 +277,7 @@ maven_library(
         include = ["compiler/src/main/resources/**"],
         exclude = ["compiler/src/main/resources/NOTICE.txt"],
     ),
+    version = BUILD_VERSION,
     visibility = ["//visibility:public"],
     deps = [
         ":tools.baseLibrary",
diff --git a/extensions-support/baseAdapters/build.gradle b/extensions-support/baseAdapters/build.gradle
index ffa40151..7a7b9903 100644
--- a/extensions-support/baseAdapters/build.gradle
+++ b/extensions-support/baseAdapters/build.gradle
@@ -71,7 +71,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions-support/build.gradle b/extensions-support/build.gradle
index f3bc3df5..620920df 100644
--- a/extensions-support/build.gradle
+++ b/extensions-support/build.gradle
@@ -131,7 +131,7 @@ task createArchive(type: Zip) {
             " project, without any history from prebuilts."
     from dataBindingConfig.maven.out_repo
     if (dataBindingConfig.maven.zip_out != null) {
-        destinationDir dataBindingConfig.maven.zip_out
+        destinationDirectory.set(dataBindingConfig.maven.zip_out)
     }
     archiveBaseName.set("dataBindingRuntimeRepo")
     doLast {
diff --git a/extensions-support/library/build.gradle b/extensions-support/library/build.gradle
index d933b552..f898e639 100644
--- a/extensions-support/library/build.gradle
+++ b/extensions-support/library/build.gradle
@@ -100,7 +100,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions-support/viewbinding/build.gradle b/extensions-support/viewbinding/build.gradle
index 1b417788..8dd97944 100644
--- a/extensions-support/viewbinding/build.gradle
+++ b/extensions-support/viewbinding/build.gradle
@@ -49,7 +49,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions/baseAdapters/build.gradle b/extensions/baseAdapters/build.gradle
index 7619c135..a81c97fb 100644
--- a/extensions/baseAdapters/build.gradle
+++ b/extensions/baseAdapters/build.gradle
@@ -70,7 +70,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions/build.gradle b/extensions/build.gradle
index b6fb7a50..96a9f335 100644
--- a/extensions/build.gradle
+++ b/extensions/build.gradle
@@ -146,7 +146,7 @@ task createArchive(type: Zip) {
             " project, without any history from prebuilts."
     from dataBindingConfig.maven.out_repo
     if (dataBindingConfig.maven.zip_out != null) {
-        destinationDir dataBindingConfig.maven.zip_out
+        destinationDirectory.set(dataBindingConfig.maven.zip_out)
     }
     archiveBaseName.set("dataBindingRuntimeRepo")
 }
diff --git a/extensions/databindingKtx/build.gradle b/extensions/databindingKtx/build.gradle
index 97636f24..0be0fcf5 100644
--- a/extensions/databindingKtx/build.gradle
+++ b/extensions/databindingKtx/build.gradle
@@ -73,7 +73,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions/library/build.gradle b/extensions/library/build.gradle
index e9a02bb5..5484dc7a 100644
--- a/extensions/library/build.gradle
+++ b/extensions/library/build.gradle
@@ -99,7 +99,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }
diff --git a/extensions/viewbinding/build.gradle b/extensions/viewbinding/build.gradle
index d80d123e..e56d2fc2 100644
--- a/extensions/viewbinding/build.gradle
+++ b/extensions/viewbinding/build.gradle
@@ -49,7 +49,7 @@ android.libraryVariants.all { variant ->
     def suffix = name.capitalize()
 
     def sourcesJarTask = project.tasks.create(name: "sourceJar${suffix}", type: Jar) {
-        classifier = 'sources'
+        archiveClassifier.set('sources')
         from android.sourceSets.main.java.srcDirs
     }
 }