Skip to content

Commit 1874199

Browse files
Merge pull request #1821 from android:kotlin182
PiperOrigin-RevId: 534179648
2 parents dbe2479 + e562a32 commit 1874199

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

WORKSPACE

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ RULES_JVM_EXTERNAL_TAG = "4.5"
88
RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6"
99

1010
# These need needs to be consistent with their counterparts in build_extensions/axt_versions.bzl.
11-
KOTLIN_VERSION = "1.7.22"
12-
KOTLINX_COROUTINES_VERSION = "1.6.4" # -> 1.7.1 when KOTLIN_VERSION -> 1.8.20
11+
KOTLIN_VERSION = "1.8.20"
12+
KOTLINX_COROUTINES_VERSION = "1.7.1"
1313
GRPC_VERSION = "1.54.1"
1414

1515
# Get from https://github.com/JetBrains/kotlin/releases/
16-
KOTLINC_RELEASE_SHA = "9db4b467743c1aea8a21c08e1c286bc2aeb93f14c7ba2037dbd8f48adc357d83"
16+
KOTLINC_RELEASE_SHA = "10df74c3c6e2eafd4c7a5572352d37cbe41774996e42de627023cb4c82b50ae4"
1717

1818
http_archive(
1919
name = "rules_jvm_external",
@@ -220,9 +220,8 @@ robolectric_repositories()
220220

221221
# Kotlin toolchains
222222

223-
rules_kotlin_version = "1.7.1"
224-
225-
rules_kotlin_sha = "fd92a98bd8a8f0e1cdcb490b93f5acef1f1727ed992571232d33de42395ca9b3"
223+
rules_kotlin_version = "1.8-RC-12"
224+
rules_kotlin_sha = "8e5c8ab087e0fa3fbb58e1f6b99d8fe40f75bac44994c3d208eba723284465d6"
226225

227226
http_archive(
228227
name = "io_bazel_rules_kotlin",

build_extensions/axt_versions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ JANK_VERSION = "1.0.1"
4444

4545
# this should match the kotlin toolchain version eg bazel_rules/rules_kotlin/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl KT_VERSION
4646
# and WORKSPACE:KOTLIN_VERSION
47-
KOTLIN_VERSION = "1.7.22"
47+
KOTLIN_VERSION = "1.8.20"
4848
GRPC_VERSION = "1.54.1" # needs to match WORKSPACE:GRPC_VERSION
4949

5050
ATF_VERSION = "3.1.2" # accessibilitytestframework

0 commit comments

Comments
 (0)