From 705510cdc2486a7d76d153bbf1758b07e842d0c0 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Wed, 6 Nov 2024 10:32:51 +0000 Subject: [PATCH 1/2] ZoneOffset.of("Z") must return UTC --- core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala b/core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala index a091cfa96..b82705208 100644 --- a/core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala +++ b/core/shared/src/main/scala/org/threeten/bp/ZoneOffset.scala @@ -103,7 +103,9 @@ object ZoneOffset { var _offsetId = offsetId Objects.requireNonNull(_offsetId, "offsetId") - // "Z" is always in the cache + if (_offsetId == "Z") + return ZoneOffset.UTC + val offset: ZoneOffset = ID_CACHE.get(_offsetId) if (offset != null) return offset From 8ed982f5fd6c568557b9480dab3582bea43ce353 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Wed, 6 Nov 2024 10:38:03 +0000 Subject: [PATCH 2/2] Update tlBaseVersion --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 882f37b56..fd83abe4b 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ val scala3 = "3.3.3" ThisBuild / scalaVersion := scala213 ThisBuild / crossScalaVersions := Seq("2.12.17", scala213, scala3) -ThisBuild / tlBaseVersion := "2.5" +ThisBuild / tlBaseVersion := "2.6" ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false)