Merge pull request #520 from keynmol/special-case-Z-ZoneOffset

ZoneOffset.of("Z") must return UTC
cquiroz · Nov 6, 2024 · 3f25107 · 3f25107
2 parents f3b5cd0 + 8ed982f
commit 3f25107
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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)
 

diff --git 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