From 5daed0a28d6afe50b3e9fe83d4444efabb1f33f8 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 7 Jan 2026 22:39:17 -0500 Subject: [PATCH 1/2] Update Kotlin to version 2.3.0 --- CHANGELOG.md | 2 ++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff18e60b2d..30b43b3569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ * Event timestamps are now always clamped to the range of a signed 64-bit integer. An overflow is recorded in the new metric `glean.error.event_timestamp_clamped` in case this happens ([#3308](https://github.com/mozilla/glean/pull/3308)). * BREAKING CHANGE: Updated to UniFFI 0.31.0 ([#3366](https://github.com/mozilla/glean/pull/3366)) +* Android + * Updated Kotlin to 2.3.0 ([#3379](https://github.com/mozilla/glean/pull/3379)) # v66.3.0 (2025-12-19) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 89bc8f8794..affd7314c9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ [versions] # AGP -android-plugin = "8.13.1" +android-plugin = "8.13.2" # Kotlin -kotlin-compiler = "2.2.21" +kotlin-compiler = "2.3.0" kotlinx-coroutines = "1.10.2" kotlinx-serialization = "1.9.0" From 66abf65e4675c09a079a194687ae73a4036edb14 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 7 Jan 2026 22:46:42 -0500 Subject: [PATCH 2/2] Remove redundant Kotlin conversion method call --- .../java/mozilla/telemetry/glean/private/DatetimeMetricType.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/DatetimeMetricType.kt b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/DatetimeMetricType.kt index 5aab2da237..cf8c7a5df1 100644 --- a/glean-core/android/src/main/java/mozilla/telemetry/glean/private/DatetimeMetricType.kt +++ b/glean-core/android/src/main/java/mozilla/telemetry/glean/private/DatetimeMetricType.kt @@ -55,7 +55,7 @@ class DatetimeMetricType( val cal = Calendar.getInstance() cal.set(Calendar.ZONE_OFFSET, AndroidTimeUnit.SECONDS.toMillis(dt.offsetSeconds.toLong()).toInt()) cal.set(Calendar.DST_OFFSET, 0) // we pretend its never DST. The zone offset will have that already. - cal.set(Calendar.YEAR, dt.year.toInt()) + cal.set(Calendar.YEAR, dt.year) cal.set(Calendar.MONTH, dt.month.toInt() - 1) // java.util.calendar's month is 0-based for months cal.set(Calendar.DAY_OF_MONTH, dt.day.toInt()) cal.set(Calendar.HOUR_OF_DAY, dt.hour.toInt())