Skip to content

Commit 910b949

Browse files
committed
Downgrade to kotlin 1.9.
The rest of androidx defaults to 1.8 currently, and thus forcing a 2.1 dependency is undesirable.
1 parent 7554b07 commit 910b949

File tree

13 files changed

+38
-8
lines changed

13 files changed

+38
-8
lines changed

BUILD

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
load("@rules_jvm_external//:defs.bzl", "artifact")
22
load("@rules_license//rules:license.bzl", "license")
33
load("//build_extensions/maven:maven_repo.bzl", "maven_repository")
4+
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
5+
load("//build_extensions:axt_deps_versions.bzl", "KOTLIN_LANG_VERSION")
46

57
package(default_visibility = ["//:__subpackages__"])
68

@@ -10,6 +12,13 @@ exports_files([
1012
"repo.bzl",
1113
])
1214

15+
# Setup kotlin toolchain
16+
define_kt_toolchain(
17+
name = "kotlin_toolchain",
18+
api_version = KOTLIN_LANG_VERSION,
19+
language_version = KOTLIN_LANG_VERSION,
20+
)
21+
1322
# Creates maven release repository
1423
maven_repository(
1524
name = "axt_m2repository",

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl.
2-
KOTLIN_VERSION = "2.1.0"
3-
KOTLINX_COROUTINES_VERSION = "1.10.1"
2+
KOTLIN_VERSION = "1.9.21"
3+
KOTLINX_COROUTINES_VERSION = "1.8.1"
44
GRPC_VERSION = "1.71.0"
55

66
bazel_dep(name = "rules_java", version = "8.6.3")

WORKSPACE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#############################
2-
# Load Android Sdk
3-
#############################
1+
# Define project setup not yet supported in MODULE.bzlmod
2+
43

5-
# This is needed by rules_kotlin.
6-
# TODO(brettchabot): move this to MODULE.bzlmod
4+
# Load Android Sdk
75

86
android_sdk_repository(
97
name = "androidsdk",
108
api_level = 35,
119
build_tools_version = "35.0.0",
1210
)
11+
12+
register_toolchains("//:kotlin_toolchain")

build_extensions/axt_deps_versions.bzl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66

77
# Maven dependency versions
88
ANDROIDX_ANNOTATION_VERSION = "1.7.0"
9-
KOTLIN_VERSION = "2.1.0"
9+
KOTLIN_VERSION = "1.9.21"
10+
KOTLIN_LANG_VERSION = "1.9"
1011
GRPC_VERSION = "1.71.0"
12+
13+

core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Bug Fixes**
88

9+
* Downgrade to kotlin 1.9
10+
911
**New Features**
1012

1113
**Breaking Changes**

espresso/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The following artifacts were released:
1616

1717
**Bug Fixes**
1818

19+
* Downgrade to kotlin 1.9
20+
1921
**New Features**
2022

2123
**Breaking Changes**

espresso/device/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Bug Fixes**
88

9+
* Downgrade to kotlin 1.9
10+
911
**New Features**
1012

1113
**Breaking Changes**

ext/junit/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ are released.
77

88
**Bug Fixes**
99

10+
* Downgrade to kotlin 1.9
11+
1012
**New Features**
1113

1214
**Breaking Changes**

runner/android_junit_runner/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Bug Fixes**
88

9+
* Downgrade to kotlin 1.9
10+
911
**New Features**
1012

1113
**Breaking Changes**

runner/android_test_orchestrator/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Bug Fixes**
88

9+
* Downgrade to kotlin 1.9
10+
911
**New Features**
1012

1113
**Breaking Changes**

0 commit comments

Comments
 (0)