Cache .zoneId. Update dependencies.

mikla · mikla · commit 80535f4df6dc · 2025-07-31T17:38:37.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,34 @@
+# Compiled class files
 *.class
+
+# Log files
 *.log
 
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Virtual machine crash logs
+hs_err_pid*
+replay_pid*
+
+# Scala specific
+*.scala
+!src/**/*.scala
+!test/**/*.scala
+!examples/**/*.scala
+
 # sbt specific
 .cache
 .history
@@ -11,6 +39,175 @@ lib_managed/
 src_managed/
 project/boot/
 project/plugins/project/
+project/target/
+project/project/
+project/.bloop/
+project/.metals/
+project/.bsp/
+
+# Metals (Scala Language Server)
+.metals/
+.bloop/
+.bsp/
+
+# Mill
+out/
+.mill-version
+
+# Coursier
+.coursier/
+
+# Ammonite
+.ammonite/
+
+# Ensime
+.ensime_cache/
+.ensime
+
+# Scala IDE
+.scala_dependencies
+.worksheet
+
+# IntelliJ IDEA
+.idea/
+*.iml
+*.ipr
+*.iws
+out/
+
+# Eclipse
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+# NetBeans
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+# VS Code
+.vscode/
+*.code-workspace
+
+# Vim
+*.swp
+*.swo
+*~
+
+# Emacs
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# macOS
 .DS_Store
+.AppleDouble
+.LSOverride
+Icon
+._*
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+*.tmp
+*.temp
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+*.lnk
+
+# Linux
+*~
+.fuse_hidden*
+.directory
+.Trash-*
+.nfs*
+
+# Node.js (for Scala.js projects)
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.npm
+.eslintcache
+.node_repl_history
+*.tgz
+.yarn-integrity
+
+# Coverage reports
+coverage/
+*.coverage
+*.lcov
+coverage.xml
+jacoco.xml
+
+# Test reports
+test-reports/
+TEST-*.xml
+
+# Temporary files
+*.tmp
+*.temp
+*.bak
+*.backup
+*.orig
+*.rej
+
+# Environment files
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Local configuration
+application.local.conf
+application.local.properties
+*.local
+
+# Database
+*.db
+*.sqlite
+*.sqlite3
+
+# Documentation build
+docs/_build/
+site/
 
-.idea
+# OS generated files
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 lazy val buildSettings = Seq(
   organization := "ru.pavkin",
-  scalaVersion := "2.13.10"
+  scalaVersion := "2.13.16"
 )
 
 lazy val compilerOptions = Seq(
@@ -17,15 +17,15 @@ lazy val compilerOptions = Seq(
   "-Ywarn-dead-code"
 )
 
-lazy val catsVersion = "2.9.0"
+lazy val catsVersion = "2.13.0"
 lazy val simulacrumVersion = "1.0.1"
-lazy val scalaJSJavaTimeVersion = "2.5.0"
-lazy val disciplineVersion = "1.5.1"
-lazy val disciplineScalatestVersion = "2.2.0"
+lazy val scalaJSJavaTimeVersion = "2.6.0"
+lazy val disciplineVersion = "1.7.0"
+lazy val disciplineScalatestVersion = "2.3.0"
 lazy val scalaCheckDateTimeVersion = "0.7.0"
-lazy val scalaCheckVersion = "1.17.0"
-lazy val scalaTestVersion = "3.2.15"
-lazy val scalaCollectionCompatVersion = "2.9.0"
+lazy val scalaCheckVersion = "1.18.1"
+lazy val scalaTestVersion = "3.2.19"
+lazy val scalaCollectionCompatVersion = "2.13.0"
 
 lazy val momentFacadeVersion = "0.10.9"
 
@@ -40,7 +40,7 @@ lazy val baseSettings = macroAnnotationOption ++ Seq(
   Test / testOptions += Tests.Argument("-oF"),
   Compile / console / scalacOptions := compilerOptions,
   Compile / test / scalacOptions := compilerOptions,
-  resolvers ++= Resolver.sonatypeOssRepos("releases"),
+  resolvers += Resolver.sonatypeCentralSnapshots,
 
   libraryDependencies ++= List("org.typelevel" %%% "simulacrum" % simulacrumVersion)
 )
diff --git a/core/jvm/src/main/scala/dtc/syntax/timeZone.scala b/core/jvm/src/main/scala/dtc/syntax/timeZone.scala
@@ -10,7 +10,7 @@ import dtc.TimeZoneId
 object timeZone {
 
   implicit final class TimeZoneIdOps(val timeZone: TimeZoneId) {
-    final def zoneId: ZoneId = ZoneId.of(timeZone.id)
+    val zoneId: ZoneId = ZoneId.of(timeZone.id)
   }
 
   implicit final class JVMZoneIdOps(val zoneId: ZoneId) extends AnyVal {
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.8.2
+sbt.version = 1.11.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,7 @@ resolvers ++= Seq(
   Classpaths.sbtPluginReleases,
   "jgit-repo" at "https://download.eclipse.org/jgit/maven"
 )
-val scalaJSVersion = "1.13.1"
+val scalaJSVersion = "1.19.0"
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
diff --git a/tests/js/src/test/scala/dtc/tests/DTCSuiteJS.scala b/tests/js/src/test/scala/dtc/tests/DTCSuiteJS.scala
@@ -23,7 +23,7 @@ trait DTCSuiteJS extends DTCSuite {
 
   val genTimeZone: Gen[TimeZoneId] = Gen.oneOf(availableZoneIds).map(TimeZoneId(_))
 
-  implicit val arbTimeZone = Arbitrary(genTimeZone)
+  implicit val arbTimeZone: Arbitrary[TimeZoneId] = Arbitrary(genTimeZone)
 
   val overflowSafePairGen: Gen[(LocalDate, LocalTime, Duration)] = for {
     date <- Gen.choose(-daysLimit / 2, daysLimit / 2).map(anchorDate.plusDays)
diff --git a/tests/js/src/test/scala/dtc/tests/JSDateTests.scala b/tests/js/src/test/scala/dtc/tests/JSDateTests.scala
@@ -2,7 +2,6 @@ package dtc.tests
 
 import java.time.{LocalDate, LocalTime}
 
-import cats.instances.option._
 import cats.kernel.laws.discipline.OrderTests
 import dtc.instances.jsDate._
 import dtc.js.JSDate
diff --git a/tests/js/src/test/scala/dtc/tests/MomentLocalDateTimeTests.scala b/tests/js/src/test/scala/dtc/tests/MomentLocalDateTimeTests.scala
@@ -2,12 +2,11 @@ package dtc.tests
 
 import java.time.{LocalDate, LocalTime}
 
-import cats.instances.option._
 import cats.kernel.laws.discipline.OrderTests
 import dtc.instances.moment._
 import dtc.js.MomentLocalDateTime
 import dtc.laws.{DateTimeTests, LocalDateTimeTests, ProviderTests}
-import org.scalacheck.Arbitrary
+import org.scalacheck.{Arbitrary, Cogen}
 import org.scalacheck.Arbitrary.arbitrary
 import dtc.instances.moment.providers.realMomentLocalDateTimeProvider
 
@@ -18,7 +17,7 @@ class MomentLocalDateTimeTests extends DTCSuiteJS {
     time <- arbitrary[LocalTime]
   } yield MomentLocalDateTime.of(date, time))
 
-  implicit val cogenT = cogenMomentDateTime[MomentLocalDateTime]
+  implicit val cogenT: Cogen[MomentLocalDateTime] = cogenMomentDateTime[MomentLocalDateTime]
 
   val pairGen = overflowSafePairGen.map(t => (MomentLocalDateTime.of(t._1, t._2), t._3))
   val ldtTests = LocalDateTimeTests[MomentLocalDateTime](
diff --git a/tests/js/src/test/scala/dtc/tests/MomentZonedDateTimeTests.scala b/tests/js/src/test/scala/dtc/tests/MomentZonedDateTimeTests.scala
@@ -2,7 +2,6 @@ package dtc.tests
 
 import java.time.{Duration, LocalDate, LocalTime}
 
-import cats.instances.option._
 import cats.kernel.laws.discipline.OrderTests
 import dtc.{TimeZoneId, Zoned}
 import dtc.js.MomentZonedDateTime
diff --git a/tests/jvm/src/test/scala/dtc/tests/JVMZonedDateTimeTests.scala b/tests/jvm/src/test/scala/dtc/tests/JVMZonedDateTimeTests.scala
@@ -3,7 +3,6 @@ package dtc.tests
 import java.time.temporal.ChronoUnit
 import java.time.{Duration, ZonedDateTime}
 
-import cats.instances.option._
 import cats.kernel.laws.discipline.OrderTests
 import com.fortysevendeg.scalacheck.datetime.jdk8.ArbitraryJdk8
 import dtc.{Offset, Zoned}
diff --git a/tests/jvm/src/test/scala/dtc/tests/LocalDateTimeTests.scala b/tests/jvm/src/test/scala/dtc/tests/LocalDateTimeTests.scala
@@ -2,7 +2,6 @@ package dtc.tests
 
 import java.time.{Duration, LocalDateTime, ZoneOffset}
 
-import cats.instances.option._
 import cats.kernel.laws.discipline.OrderTests
 import com.fortysevendeg.scalacheck.datetime.jdk8.ArbitraryJdk8.genZonedDateTime
 import dtc.instances.localDateTime._
diff --git a/tests/shared/src/test/scala/dtc/tests/DTCSuite.scala b/tests/shared/src/test/scala/dtc/tests/DTCSuite.scala
@@ -29,7 +29,7 @@ trait DTCSuite extends AnyFunSpecLike
     Gen.choose(Long.MinValue / 1000, Long.MaxValue / 1000)
       .map(l => Duration.of(l, MILLIS))
 
-  implicit val arbDuration = Arbitrary(genDuration)
+  implicit val arbDuration: Arbitrary[Duration] = Arbitrary(genDuration)
 
   def genDateTimeFromSameOffsetPeriod(period: SameZoneOffsetPeriod): Gen[(LocalDate, LocalTime, TimeZoneId)] = for {
     date <- Gen.choose(period.startDate.toEpochDay + 1L, period.endDate.toEpochDay - 1L).map(LocalDate.ofEpochDay)
diff --git a/tests/shared/src/test/scala/dtc/tests/package.scala b/tests/shared/src/test/scala/dtc/tests/package.scala
@@ -21,6 +21,6 @@ package object tests {
 
   val genSameOffsetPeriod: Gen[SameZoneOffsetPeriod] = Gen.oneOf(sameOffsetZonedTimePeriods)
 
-  implicit val arbSameOffsetPeriod = Arbitrary(genSameOffsetPeriod)
+  implicit val arbSameOffsetPeriod: Arbitrary[SameZoneOffsetPeriod] = Arbitrary(genSameOffsetPeriod)
 
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import dtc.TimeZoneId`
`10`	`10`	`object timeZone {`
`11`	`11`
`12`	`12`	`implicit final class TimeZoneIdOps(val timeZone: TimeZoneId) {`
`13`		`- final def zoneId: ZoneId = ZoneId.of(timeZone.id)`
	`13`	`+ val zoneId: ZoneId = ZoneId.of(timeZone.id)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`implicit final class JVMZoneIdOps(val zoneId: ZoneId) extends AnyVal {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version = 1.8.2`
	`1`	`+sbt.version = 1.11.3`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ resolvers ++= Seq(`
`3`	`3`	`Classpaths.sbtPluginReleases,`
`4`	`4`	`"jgit-repo" at "https://download.eclipse.org/jgit/maven"`
`5`	`5`	`)`
`6`		`-val scalaJSVersion = "1.13.1"`
	`6`	`+val scalaJSVersion = "1.19.0"`
`7`	`7`
`8`	`8`	`addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)`
`9`	`9`