Skip to content

Commit 5050e8f

Browse files
brettchabotcopybara-androidxtest
brettchabot
authored and
copybara-androidxtest
committed
Internal code sync
FUTURE_COPYBARA_INTEGRATE_REVIEW=#2378 from android:kotlin19 910b949 PiperOrigin-RevId: 742850595
1 parent 7554b07 commit 5050e8f

File tree

16 files changed

+68
-40
lines changed

16 files changed

+68
-40
lines changed

‎BUILD‎

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

57
package(default_visibility = ["//:__subpackages__"])
@@ -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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
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"

‎build_extensions/axt_released_versions.bzl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
"""Defines current released AXT versions."""
22

3-
RUNNER_VERSION = "1.7.0-alpha01"
4-
RULES_VERSION = "1.7.0-alpha01"
5-
MONITOR_VERSION = "1.8.0-alpha01"
6-
ESPRESSO_VERSION = "3.7.0-alpha01"
7-
CORE_VERSION = "1.7.0-alpha01"
8-
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha01"
9-
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha01"
10-
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha01"
11-
ORCHESTRATOR_VERSION = "1.6.0-alpha02"
12-
SERVICES_VERSION = "1.6.0-alpha02"
3+
RUNNER_VERSION = "1.7.0-alpha02"
4+
RULES_VERSION = "1.7.0-alpha02"
5+
MONITOR_VERSION = "1.8.0-alpha02"
6+
ESPRESSO_VERSION = "3.7.0-alpha02"
7+
CORE_VERSION = "1.7.0-alpha02"
8+
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
9+
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
10+
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
11+
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
12+
SERVICES_VERSION = "1.6.0-alpha03"

‎build_extensions/axt_versions.bzl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
44
//:axt_m2_repository and gradle-tests/settings.gradle
55
"""
66

7-
RUNNER_VERSION = "1.7.0-alpha02"
8-
RULES_VERSION = "1.7.0-alpha02"
9-
MONITOR_VERSION = "1.8.0-alpha02"
10-
ESPRESSO_VERSION = "3.7.0-alpha02"
11-
CORE_VERSION = "1.7.0-alpha02"
12-
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
13-
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
14-
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
15-
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
16-
SERVICES_VERSION = "1.6.0-alpha03"
7+
RUNNER_VERSION = "1.7.0-alpha03"
8+
RULES_VERSION = "1.7.0-alpha03"
9+
MONITOR_VERSION = "1.8.0-alpha03"
10+
ESPRESSO_VERSION = "3.7.0-alpha03"
11+
CORE_VERSION = "1.7.0-alpha03"
12+
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha03"
13+
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha03"
14+
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha03"
15+
ORCHESTRATOR_VERSION = "1.6.0-alpha04"
16+
SERVICES_VERSION = "1.6.0-alpha04"
1717

1818
# Full maven artifact strings for apks.
1919
SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION

‎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**

0 commit comments

Comments
 (0)