diff options
author | Matthew Gharrity <gharrma@google.com> | 2023-05-22 15:43:05 -0700 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-06 23:37:48 +0000 |
commit | e65efb6a14ead2867dd4f22d29b1e4ef2f667449 (patch) | |
tree | 9d9328a28a326216cc43cf4b2e51a6e1b7294b99 | |
parent | e43f1732b4c75e0cab079d1c24ae3b7881efaf24 (diff) | |
download | base-e65efb6a14ead2867dd4f22d29b1e4ef2f667449.tar.gz |
Update Kotlinc in Bazel to version 1.8.21
Bug: 283858241
Test: bazel build
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:99c519ea1a54f20924de1e68bbe13a9ca30eca76)
Merged-In: I1355dc1250c348ce2e621e3779741d50da98b09f
Change-Id: I1355dc1250c348ce2e621e3779741d50da98b09f
-rw-r--r-- | bazel/maven/BUILD.maven | 78 | ||||
-rw-r--r-- | bazel/maven/artifacts.bzl | 8 |
2 files changed, 51 insertions, 35 deletions
diff --git a/bazel/maven/BUILD.maven b/bazel/maven/BUILD.maven index c0e79b6787..e4e7062c9a 100644 --- a/bazel/maven/BUILD.maven +++ b/bazel/maven/BUILD.maven @@ -38868,10 +38868,10 @@ maven_artifact( ) maven_artifact( - name = "org.jetbrains.compose.compiler.compiler-hosted_1.3.2", - pom = "repository/org/jetbrains/compose/compiler/compiler-hosted/1.3.2/compiler-hosted-1.3.2.pom", + name = "org.jetbrains.compose.compiler.compiler-hosted_1.4.5", + pom = "repository/org/jetbrains/compose/compiler/compiler-hosted/1.4.5/compiler-hosted-1.4.5.pom", repo_root_path = "repository", - repo_path = "org/jetbrains/compose/compiler/compiler-hosted/1.3.2", + repo_path = "org/jetbrains/compose/compiler/compiler-hosted/1.4.5", visibility = ["//visibility:public"], ) @@ -39382,34 +39382,10 @@ maven_artifact( ) maven_artifact( - name = "org.jetbrains.kotlin.jvm-abi-gen_1.7.0", - pom = "repository/org/jetbrains/kotlin/jvm-abi-gen/1.7.0/jvm-abi-gen-1.7.0.pom", + name = "org.jetbrains.kotlin.jvm-abi-gen_1.8.21", + pom = "repository/org/jetbrains/kotlin/jvm-abi-gen/1.8.21/jvm-abi-gen-1.8.21.pom", repo_root_path = "repository", - repo_path = "org/jetbrains/kotlin/jvm-abi-gen/1.7.0", - visibility = ["//visibility:public"], -) - -maven_artifact( - name = "org.jetbrains.kotlin.jvm-abi-gen_1.7.20", - pom = "repository/org/jetbrains/kotlin/jvm-abi-gen/1.7.20/jvm-abi-gen-1.7.20.pom", - repo_root_path = "repository", - repo_path = "org/jetbrains/kotlin/jvm-abi-gen/1.7.20", - visibility = ["//visibility:public"], -) - -maven_artifact( - name = "org.jetbrains.kotlin.jvm-abi-gen_1.8.10", - pom = "repository/org/jetbrains/kotlin/jvm-abi-gen/1.8.10/jvm-abi-gen-1.8.10.pom", - repo_root_path = "repository", - repo_path = "org/jetbrains/kotlin/jvm-abi-gen/1.8.10", - visibility = ["//visibility:public"], -) - -maven_artifact( - name = "org.jetbrains.kotlin.jvm-abi-gen_1.8.20-Beta", - pom = "repository/org/jetbrains/kotlin/jvm-abi-gen/1.8.20-Beta/jvm-abi-gen-1.8.20-Beta.pom", - repo_root_path = "repository", - repo_path = "org/jetbrains/kotlin/jvm-abi-gen/1.8.20-Beta", + repo_path = "org/jetbrains/kotlin/jvm-abi-gen/1.8.21", visibility = ["//visibility:public"], ) @@ -40427,6 +40403,20 @@ maven_artifact( ) maven_artifact( + name = "org.jetbrains.kotlin.kotlin-compiler_1.8.21", + pom = "repository/org/jetbrains/kotlin/kotlin-compiler/1.8.21/kotlin-compiler-1.8.21.pom", + repo_root_path = "repository", + repo_path = "org/jetbrains/kotlin/kotlin-compiler/1.8.21", + deps = [ + "org.jetbrains.kotlin.kotlin-stdlib_1.8.21", + "org.jetbrains.kotlin.kotlin-script-runtime_1.8.21", + "org.jetbrains.kotlin.kotlin-reflect_1.6.10", + "org.jetbrains.intellij.deps.trove4j_1.0.20200330", + ], + visibility = ["//visibility:public"], +) + +maven_artifact( name = "org.jetbrains.kotlin.kotlin-daemon-client_1.3.20", pom = "repository/org/jetbrains/kotlin/kotlin-daemon-client/1.3.20/kotlin-daemon-client-1.3.20.pom", repo_root_path = "repository", @@ -42170,6 +42160,14 @@ maven_artifact( ) maven_artifact( + name = "org.jetbrains.kotlin.kotlin-script-runtime_1.8.21", + pom = "repository/org/jetbrains/kotlin/kotlin-script-runtime/1.8.21/kotlin-script-runtime-1.8.21.pom", + repo_root_path = "repository", + repo_path = "org/jetbrains/kotlin/kotlin-script-runtime/1.8.21", + visibility = ["//visibility:public"], +) + +maven_artifact( name = "org.jetbrains.kotlin.kotlin-scripting-common_1.3.41", pom = "repository/org/jetbrains/kotlin/kotlin-scripting-common/1.3.41/kotlin-scripting-common-1.3.41.pom", repo_root_path = "repository", @@ -43028,6 +43026,14 @@ maven_artifact( ) maven_artifact( + name = "org.jetbrains.kotlin.kotlin-stdlib-common_1.8.21", + pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21/kotlin-stdlib-common-1.8.21.pom", + repo_root_path = "repository", + repo_path = "org/jetbrains/kotlin/kotlin-stdlib-common/1.8.21", + visibility = ["//visibility:public"], +) + +maven_artifact( name = "org.jetbrains.kotlin.kotlin-stdlib-jdk7_1.2.71", pom = "repository/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom", repo_root_path = "repository", @@ -44076,6 +44082,18 @@ maven_artifact( ) maven_artifact( + name = "org.jetbrains.kotlin.kotlin-stdlib_1.8.21", + pom = "repository/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom", + repo_root_path = "repository", + repo_path = "org/jetbrains/kotlin/kotlin-stdlib/1.8.21", + deps = [ + "org.jetbrains.kotlin.kotlin-stdlib-common_1.8.21", + "org.jetbrains.annotations_13.0", + ], + visibility = ["//visibility:public"], +) + +maven_artifact( name = "org.jetbrains.kotlin.kotlin-test-junit_1.7.10", pom = "repository/org/jetbrains/kotlin/kotlin-test-junit/1.7.10/kotlin-test-junit-1.7.10.pom", repo_root_path = "repository", diff --git a/bazel/maven/artifacts.bzl b/bazel/maven/artifacts.bzl index 48e51b6414..6e628781c4 100644 --- a/bazel/maven/artifacts.bzl +++ b/bazel/maven/artifacts.bzl @@ -525,7 +525,7 @@ DATA = [ "org.javassist:javassist:3.26.0-GA", "org.jdeferred:jdeferred-android-aar:1.2.2", "org.jdeferred:jdeferred-android-aar:1.2.3", - "org.jetbrains.compose.compiler:compiler-hosted:1.3.2", + "org.jetbrains.compose.compiler:compiler-hosted:1.4.5", "org.jetbrains.compose.foundation:foundation-desktop:1.1.1", "com.android.tools.utp:android-test-plugin-host-retention:30.2.0", "com.android.tools.utp:android-test-plugin-result-listener-gradle:30.2.0", @@ -547,10 +547,7 @@ DATA = [ "org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.8.20-Beta", "org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.8.0", "org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.8.10", - "org.jetbrains.kotlin:jvm-abi-gen:1.7.0", - "org.jetbrains.kotlin:jvm-abi-gen:1.7.20", - "org.jetbrains.kotlin:jvm-abi-gen:1.8.10", - "org.jetbrains.kotlin:jvm-abi-gen:1.8.20-Beta", + "org.jetbrains.kotlin:jvm-abi-gen:1.8.21", "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.21", "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.0", @@ -576,6 +573,7 @@ DATA = [ "org.jetbrains.kotlin:kotlin-compiler:1.7.0", "org.jetbrains.kotlin:kotlin-compiler:1.7.20", "org.jetbrains.kotlin:kotlin-compiler:1.8.20-Beta", + "org.jetbrains.kotlin:kotlin-compiler:1.8.21", "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.0", "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20", "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.21", |