Snap for 8709740 from 042ac9e653b78e550b70828558fca53ba541752e to studio-dolphin-release

Change-Id: I03272c68fed3ee9197ad30190ce19601dcc418e0

11 files changed, 166 insertions, 145 deletions

diff --git a/bazel/maven/BUILD.maven b/bazel/maven/BUILD.maven
index 957cc1796a..1ed88010f9 100644
--- a/bazel/maven/BUILD.maven
+++ b/bazel/maven/BUILD.maven
@@ -27729,12 +27729,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.jvm.org.jetbrains.kotlin.jvm.gradle.plugin_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.6.21/org.jetbrains.kotlin.jvm.gradle.plugin-1.6.21.pom",
+    name = "org.jetbrains.kotlin.jvm.org.jetbrains.kotlin.jvm.gradle.plugin_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.0/org.jetbrains.kotlin.jvm.gradle.plugin-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.6.21",
+    repo_path = "org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-gradle-plugin_1.6.21",
+        "org.jetbrains.kotlin.kotlin-gradle-plugin_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -27814,12 +27814,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-android-extensions-runtime_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.6.21/kotlin-android-extensions-runtime-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-android-extensions-runtime_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.0/kotlin-android-extensions-runtime-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-stdlib_1.6.21",
+        "org.jetbrains.kotlin.kotlin-stdlib_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -27902,12 +27902,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-android-extensions_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-android-extensions/1.6.21/kotlin-android-extensions-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-android-extensions_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-android-extensions/1.7.0/kotlin-android-extensions-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-android-extensions/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-android-extensions/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -27994,12 +27994,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-annotation-processing-gradle_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.21/kotlin-annotation-processing-gradle-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-annotation-processing-gradle_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.0/kotlin-annotation-processing-gradle-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -28061,10 +28061,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-build-common_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-build-common/1.6.21/kotlin-build-common-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-build-common_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-build-common/1.7.0/kotlin-build-common-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-build-common/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-build-common/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -28165,12 +28165,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.21/kotlin-compiler-embeddable-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.0/kotlin-compiler-embeddable-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-daemon-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-daemon-embeddable_1.7.0",
         "org.jetbrains.intellij.deps.trove4j_1.0.20200330",
         "net.java.dev.jna.jna_5.6.0",
     ],
@@ -28271,15 +28271,15 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-compiler-runner_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.21/kotlin-compiler-runner-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-compiler-runner_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-compiler-runner/1.7.0/kotlin-compiler-runner-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-compiler-runner/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-compiler-runner/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-build-common_1.6.21",
-        "org.jetbrains.kotlin.kotlin-daemon-client_1.6.21",
+        "org.jetbrains.kotlin.kotlin-build-common_1.7.0",
+        "org.jetbrains.kotlin.kotlin-daemon-client_1.7.0",
         "org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm_1.5.0",
-        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -28372,10 +28372,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-daemon-client_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-daemon-client/1.6.21/kotlin-daemon-client-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-daemon-client_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-daemon-client/1.7.0/kotlin-daemon-client-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-daemon-client/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-daemon-client/1.7.0",
     deps = [
         "org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm_1.5.0",
     ],
@@ -28423,10 +28423,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-daemon-embeddable_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.21/kotlin-daemon-embeddable-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-daemon-embeddable_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.0/kotlin-daemon-embeddable-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -28513,14 +28513,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-gradle-plugin-api_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.21/kotlin-gradle-plugin-api-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-gradle-plugin-idea_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.0/kotlin-gradle-plugin-idea-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.21",
-    deps = [
-        "org.jetbrains.kotlin.kotlin-native-utils_1.6.21",
-        "org.jetbrains.kotlin.kotlin-project-model_1.6.21",
-    ],
+    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -28593,10 +28589,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-gradle-plugin-model_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.21/kotlin-gradle-plugin-model-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-gradle-plugin-model_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.0/kotlin-gradle-plugin-model-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -28769,27 +28765,28 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-gradle-plugin_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.21/kotlin-gradle-plugin-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-gradle-plugin_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.0/kotlin-gradle-plugin-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-gradle-plugin-api_1.6.21",
-        "org.jetbrains.kotlin.kotlin-gradle-plugin-model_1.6.21",
-        "org.jetbrains.kotlin.kotlin-util-klib_1.6.21",
-        "org.jetbrains.kotlin.kotlin-klib-commonizer-api_1.6.21",
-        "org.jetbrains.kotlin.kotlin-tooling-metadata_1.6.21",
-        "org.jetbrains.kotlin.kotlin-project-model_1.6.21",
+        "org.jetbrains.kotlin.kotlin-gradle-plugin-model_1.7.0",
+        "org.jetbrains.kotlin.kotlin-tooling-core_1.7.0",
+        "org.jetbrains.kotlin.kotlin-gradle-plugin-idea_1.7.0",
+        "org.jetbrains.kotlin.kotlin-util-klib_1.7.0",
+        "org.jetbrains.kotlin.kotlin-klib-commonizer-api_1.7.0",
+        "org.jetbrains.kotlin.kotlin-tooling-metadata_1.7.0",
+        "org.jetbrains.kotlin.kotlin-project-model_1.7.0",
         "com.google.code.gson.gson_2.8.9",
         "com.google.guava.guava_29.0-jre",
         "de.undercouch.gradle-download-task_4.1.1",
         "com.github.gundy.semver4j_0.16.4",
-        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.6.21",
-        "org.jetbrains.kotlin.kotlin-annotation-processing-gradle_1.6.21",
-        "org.jetbrains.kotlin.kotlin-android-extensions_1.6.21",
-        "org.jetbrains.kotlin.kotlin-compiler-runner_1.6.21",
-        "org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable_1.6.21",
-        "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-compiler-embeddable_1.7.0",
+        "org.jetbrains.kotlin.kotlin-annotation-processing-gradle_1.7.0",
+        "org.jetbrains.kotlin.kotlin-android-extensions_1.7.0",
+        "org.jetbrains.kotlin.kotlin-compiler-runner_1.7.0",
+        "org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable_1.7.0",
+        "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -28828,12 +28825,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-klib-commonizer-api_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.21/kotlin-klib-commonizer-api-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-klib-commonizer-api_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.0/kotlin-klib-commonizer-api-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-native-utils_1.6.21",
+        "org.jetbrains.kotlin.kotlin-native-utils_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -28895,12 +28892,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-native-utils_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-native-utils/1.6.21/kotlin-native-utils-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-native-utils_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-native-utils/1.7.0/kotlin-native-utils-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-native-utils/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-native-utils/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-util-io_1.6.21",
+        "org.jetbrains.kotlin.kotlin-util-io_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -28930,10 +28927,13 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-project-model_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-project-model/1.6.21/kotlin-project-model-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-project-model_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-project-model/1.7.0/kotlin-project-model-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-project-model/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-project-model/1.7.0",
+    deps = [
+        "org.jetbrains.kotlin.kotlin-tooling-core_1.7.0",
+    ],
     visibility = ["//visibility:public"],
 )
 
@@ -29092,12 +29092,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-reflect_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-reflect/1.6.21/kotlin-reflect-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-reflect_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-reflect/1.7.0/kotlin-reflect-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-reflect/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-reflect/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-stdlib_1.6.21",
+        "org.jetbrains.kotlin.kotlin-stdlib_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -29159,10 +29159,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-script-runtime_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-script-runtime/1.6.21/kotlin-script-runtime-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-script-runtime_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-script-runtime/1.7.0/kotlin-script-runtime-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-script-runtime/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-script-runtime/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -29231,10 +29231,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-scripting-common_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-common/1.6.21/kotlin-scripting-common-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-scripting-common_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-common/1.7.0/kotlin-scripting-common-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-scripting-common/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-scripting-common/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -29316,12 +29316,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.21/kotlin-scripting-compiler-embeddable-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.0/kotlin-scripting-compiler-embeddable-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.6.21",
+        "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -29406,13 +29406,13 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.21/kotlin-scripting-compiler-impl-embeddable-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-scripting-compiler-impl-embeddable_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.0/kotlin-scripting-compiler-impl-embeddable-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-scripting-common_1.6.21",
-        "org.jetbrains.kotlin.kotlin-scripting-jvm_1.6.21",
+        "org.jetbrains.kotlin.kotlin-scripting-common_1.7.0",
+        "org.jetbrains.kotlin.kotlin-scripting-jvm_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -29490,12 +29490,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-scripting-jvm_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.21/kotlin-scripting-jvm-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-scripting-jvm_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0/kotlin-scripting-jvm-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-scripting-common_1.6.21",
+        "org.jetbrains.kotlin.kotlin-scripting-common_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -29693,10 +29693,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-stdlib-common_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-stdlib-common_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0/kotlin-stdlib-common-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-common/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -29866,12 +29866,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21/kotlin-stdlib-jdk7-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0/kotlin-stdlib-jdk7-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-stdlib_1.6.21",
+        "org.jetbrains.kotlin.kotlin-stdlib_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -30057,13 +30057,13 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21/kotlin-stdlib-jdk8-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-stdlib-jdk8_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0/kotlin-stdlib-jdk8-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-stdlib_1.6.21",
-        "org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.6.21",
+        "org.jetbrains.kotlin.kotlin-stdlib_1.7.0",
+        "org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
@@ -30446,12 +30446,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-stdlib_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-stdlib_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-stdlib/1.7.0/kotlin-stdlib-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-stdlib/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-stdlib/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-stdlib-common_1.6.21",
+        "org.jetbrains.kotlin.kotlin-stdlib-common_1.7.0",
         "org.jetbrains.annotations_13.0",
     ],
     visibility = ["//visibility:public"],
@@ -30470,6 +30470,14 @@ maven_artifact(
 )
 
 maven_artifact(
+    name = "org.jetbrains.kotlin.kotlin-tooling-core_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-tooling-core/1.7.0/kotlin-tooling-core-1.7.0.pom",
+    repo_root_path = "repository",
+    repo_path = "org/jetbrains/kotlin/kotlin-tooling-core/1.7.0",
+    visibility = ["//visibility:public"],
+)
+
+maven_artifact(
     name = "org.jetbrains.kotlin.kotlin-tooling-metadata_1.5.21",
     pom = "repository/org/jetbrains/kotlin/kotlin-tooling-metadata/1.5.21/kotlin-tooling-metadata-1.5.21.pom",
     repo_root_path = "repository",
@@ -30503,10 +30511,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-tooling-metadata_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.21/kotlin-tooling-metadata-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-tooling-metadata_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-tooling-metadata/1.7.0/kotlin-tooling-metadata-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-tooling-metadata/1.7.0",
     deps = [
         "com.google.code.gson.gson_2.8.9",
     ],
@@ -30560,10 +30568,10 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-util-io_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-util-io/1.6.21/kotlin-util-io-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-util-io_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-util-io/1.7.0/kotlin-util-io-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-util-io/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-util-io/1.7.0",
     visibility = ["//visibility:public"],
 )
 
@@ -30625,12 +30633,12 @@ maven_artifact(
 )
 
 maven_artifact(
-    name = "org.jetbrains.kotlin.kotlin-util-klib_1.6.21",
-    pom = "repository/org/jetbrains/kotlin/kotlin-util-klib/1.6.21/kotlin-util-klib-1.6.21.pom",
+    name = "org.jetbrains.kotlin.kotlin-util-klib_1.7.0",
+    pom = "repository/org/jetbrains/kotlin/kotlin-util-klib/1.7.0/kotlin-util-klib-1.7.0.pom",
     repo_root_path = "repository",
-    repo_path = "org/jetbrains/kotlin/kotlin-util-klib/1.6.21",
+    repo_path = "org/jetbrains/kotlin/kotlin-util-klib/1.7.0",
     deps = [
-        "org.jetbrains.kotlin.kotlin-util-io_1.6.21",
+        "org.jetbrains.kotlin.kotlin-util-io_1.7.0",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/bazel/maven/artifacts.bzl b/bazel/maven/artifacts.bzl
index 12bad74455..26a9967677 100644
--- a/bazel/maven/artifacts.bzl
+++ b/bazel/maven/artifacts.bzl
@@ -360,14 +360,14 @@ DATA = [
     "org.jetbrains.kotlin:jvm-abi-gen:1.6.10",
     "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10",
     "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.20",
-    "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.21",
+    "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.0",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.41",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.72",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.32",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.5.21",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.10",
     "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20",
-    "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.21",
+    "org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.7.0",
     "org.jetbrains.kotlin:kotlin-compiler:1.6.10",
     "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41",
     "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72",
@@ -375,22 +375,22 @@ DATA = [
     "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21",
     "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10",
     "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20",
-    "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21",
+    "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0",
     "org.jetbrains.kotlin:kotlin-reflect:1.4.31",
     "org.jetbrains.kotlin:kotlin-reflect:1.5.21",
     "org.jetbrains.kotlin:kotlin-reflect:1.6.10",
     "org.jetbrains.kotlin:kotlin-reflect:1.6.20",
-    "org.jetbrains.kotlin:kotlin-reflect:1.6.21",
+    "org.jetbrains.kotlin:kotlin-reflect:1.7.0",
     "org.jetbrains.kotlin:kotlin-script-runtime:1.5.21",
     "org.jetbrains.kotlin:kotlin-script-runtime:1.6.10",
     "org.jetbrains.kotlin:kotlin-script-runtime:1.6.20",
-    "org.jetbrains.kotlin:kotlin-script-runtime:1.6.21",
+    "org.jetbrains.kotlin:kotlin-script-runtime:1.7.0",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10",
     "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20",
-    "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21",
+    "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0",
     "org.jetbrains.kotlin:kotlin-test-junit:1.5.31",
     "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6",
     "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6",
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
index c21bb5bb15..8cc6c7fa25 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/TaskManager.kt
@@ -2856,6 +2856,8 @@ abstract class TaskManager<VariantBuilderT : VariantBuilderImpl, VariantT : Vari
             task.mavenCoordinateCache.setDisallowChanges(
                 getBuildService<MavenCoordinatesCacheBuildService>(project.gradle.sharedServices).get()
             )
+
+            task.notCompatibleWithConfigurationCache("Task is not compatible.")
         }
         val signingReportComponents = allPropertiesList.stream()
                 .filter { component: ComponentCreationConfig ->
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/component/ComponentCreationConfig.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/component/ComponentCreationConfig.kt
index 742aeb5619..a6674509d1 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/component/ComponentCreationConfig.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/component/ComponentCreationConfig.kt
@@ -171,6 +171,8 @@ interface ComponentCreationConfig : ComponentIdentity {
         generatedBytecodeKey: Any? = null
     ): FileCollection
 
+    val compileClasspath: FileCollection
+
     val needsMainDexListForBundle: Boolean
         get() = false
 
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/variant/BaseVariantData.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/variant/BaseVariantData.kt
index 4048099412..eedd2a9133 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/variant/BaseVariantData.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/internal/variant/BaseVariantData.kt
@@ -77,10 +77,11 @@ abstract class BaseVariantData(
     abstract val description: String
 
     fun getGeneratedBytecode(generatorKey: Any?): FileCollection {
-        return if (generatorKey == null) {
+        val fileCollection = if (generatorKey == null) {
             allPreJavacGeneratedBytecode
         } else preJavacGeneratedBytecodeMap?.get(generatorKey)
             ?: throw RuntimeException("Bytecode generator key not found")
+        return fileCollection.filter { it.exists() }
     }
 
     fun addJavaSourceFoldersToModel(generatedSourceFolder: File) {
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExtractAnnotations.java b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExtractAnnotations.java
index b9409be99c..2a61df916f 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExtractAnnotations.java
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/ExtractAnnotations.java
@@ -54,6 +54,7 @@ import org.gradle.api.artifacts.ArtifactCollection;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.artifacts.result.ResolvedArtifactResult;
+import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.EmptyFileVisitor;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileSystemLocation;
@@ -109,8 +110,6 @@ public abstract class ExtractAnnotations extends NonIncrementalTask {
     private final List<Object> sources = new ArrayList<>();
     private FileTree sourcesFileTree;
 
-    private FileCollection classpath;
-
     @Nested
     public abstract LintTool getLintTool();
 
@@ -123,9 +122,7 @@ public abstract class ExtractAnnotations extends NonIncrementalTask {
     }
 
     @CompileClasspath
-    public FileCollection getClasspath() {
-        return classpath;
-    }
+    public abstract ConfigurableFileCollection getClasspath();
 
     /** Used by the variant API */
     public void source(Object source) {
@@ -369,7 +366,7 @@ public abstract class ExtractAnnotations extends NonIncrementalTask {
 
             task.source(creationConfig.getSources().getJava().getAll());
             task.setEncoding(creationConfig.getGlobal().getCompileOptions().getEncoding());
-            task.classpath = creationConfig.getJavaClasspath(COMPILE_CLASSPATH, CLASSES_JAR, null);
+            task.getClasspath().from(creationConfig.getCompileClasspath()).disallowChanges();
 
             task.libraries =
                     creationConfig
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaCompileUtils.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaCompileUtils.kt
index ce3e07e2d1..6546eaf9fb 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaCompileUtils.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaCompileUtils.kt
@@ -26,11 +26,9 @@ import com.android.build.gradle.internal.dependency.getJdkImageFromTransform
 import com.android.build.gradle.internal.profile.AnalyticsService
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactScope.EXTERNAL
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactScope.PROJECT
-import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType.CLASSES_JAR
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType.JAR
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType.PROCESSED_JAR
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ConsumedConfigType.ANNOTATION_PROCESSOR
-import com.android.build.gradle.internal.publishing.AndroidArtifacts.ConsumedConfigType.COMPILE_CLASSPATH
 import com.android.builder.errors.IssueReporter
 import com.android.sdklib.AndroidTargetHash
 import com.android.utils.FileUtils
@@ -89,11 +87,11 @@ fun JavaCompile.configureProperties(creationConfig: ComponentCreationConfig, tas
             // classes(e.g. android.jar) that were previously passed through bootstrapClasspath need to be provided
             // through classpath
             creationConfig.global.bootClasspath,
-            creationConfig.getJavaClasspath(COMPILE_CLASSPATH, CLASSES_JAR, null)
+            creationConfig.compileClasspath
         )
     } else {
         this.options.bootstrapClasspath = task.project.files(creationConfig.global.bootClasspath)
-        this.classpath = creationConfig.getJavaClasspath(COMPILE_CLASSPATH, CLASSES_JAR, null)
+        this.classpath = creationConfig.compileClasspath
     }
 
     this.sourceCompatibility = compileOptions.sourceCompatibility.toString()
diff --git a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaDocGenerationTask.kt b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaDocGenerationTask.kt
index b258270099..2e5203d989 100644
--- a/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaDocGenerationTask.kt
+++ b/build-system/gradle-core/src/main/java/com/android/build/gradle/tasks/JavaDocGenerationTask.kt
@@ -17,8 +17,6 @@
 package com.android.build.gradle.tasks
 
 import com.android.build.gradle.internal.component.ComponentCreationConfig
-import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType.CLASSES_JAR
-import com.android.build.gradle.internal.publishing.AndroidArtifacts.ConsumedConfigType.COMPILE_CLASSPATH
 import com.android.build.gradle.internal.scope.InternalArtifactType
 import com.android.build.gradle.internal.services.DokkaParallelBuildService
 import com.android.build.gradle.internal.services.getBuildService
@@ -260,7 +258,7 @@ abstract class JavaDocGenerationTask : NonIncrementalTask() {
 
             task.classpath.fromDisallowChanges(
                 creationConfig.global.bootClasspath,
-                creationConfig.getJavaClasspath(COMPILE_CLASSPATH, CLASSES_JAR, null)
+                creationConfig.compileClasspath
             )
         }
     }
diff --git a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/application/ExtractAnnotationsTest.java b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/application/ExtractAnnotationsTest.java
index 60f6502de9..9b1cf7c871 100644
--- a/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/application/ExtractAnnotationsTest.java
+++ b/build-system/integration-test/application/src/test/java/com/android/build/gradle/integration/application/ExtractAnnotationsTest.java
@@ -23,6 +23,7 @@ import static com.android.testutils.truth.ZipFileSubject.assertThat;
 import com.android.build.gradle.integration.common.fixture.GradleBuildResult;
 import com.android.build.gradle.integration.common.fixture.GradleTestProject;
 import com.android.build.gradle.integration.common.truth.ScannerSubject;
+import com.android.build.gradle.integration.common.utils.TestFileUtils;
 import com.android.testutils.apk.Zip;
 import com.google.common.truth.Truth;
 import java.io.IOException;
@@ -194,4 +195,18 @@ public class ExtractAnnotationsTest {
                     }
                 });
     }
+
+    /** Regression test for Issue 234865137 */
+    @Test
+    public void checkNonExistentGeneratedBytecodeDirectory() throws Exception {
+        TestFileUtils.appendToFile(
+                project.getBuildFile(),
+                "\n\n"
+                        + "android.libraryVariants.all { variant ->\n"
+                        + "    variant.registerPreJavacGeneratedBytecode(\n"
+                        + "        project.files('/does/not/exist')\n"
+                        + "    )\n"
+                        + "}\n");
+        project.execute("clean", "assembleDebug");
+    }
 }
diff --git a/common/version.bzl b/common/version.bzl
index eaaaad0ee9..dc48261076 100644
--- a/common/version.bzl
+++ b/common/version.bzl
@@ -1,2 +1,2 @@
-BASE_VERSION = "30.3.0-beta03"
-BUILD_VERSION = "7.3.0-beta03"
+BASE_VERSION = "30.3.0-dev"
+BUILD_VERSION = "7.3.0-dev"
diff --git a/common/version/com/android/version.properties b/common/version/com/android/version.properties
index cc418e82ad..a0019bf1a6 100644
--- a/common/version/com/android/version.properties
+++ b/common/version/com/android/version.properties
@@ -1,8 +1,8 @@
 # The source of truth for these values are in tools/buildSrc/base
 # Consistency is maintained via tests
 
-baseVersion = 30.3.0-beta04
-buildVersion = 7.3.0-beta04
-cmdlineToolsVersion = 7.0-beta04
+baseVersion = 30.3.0-dev
+buildVersion = 7.3.0-dev
+cmdlineToolsVersion = 3.0-dev
 apiVersion = 3
 nativeApiVersion = 0