Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ aa7db3a42121f78a5b3bed3658786c1cef83efe8

# Enable scalafmt for Scala 3
64df4ae51873593a789af5848bd225c14d0baf8a

# Scala Steward: Reformat with scalafmt 3.7.4
fcff0321302ad8a301837c2a99dd0d423c12ab90
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.6.1"
version = "3.7.4"
style = default

maxColumn = 100
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.in(file("core"))
.settings(commonSettings)
.settings(
name := "scala-java-time",
name := "scala-java-time",
libraryDependencies += ("org.portable-scala" %%% "portable-scala-reflect" % "1.1.2")
.cross(CrossVersion.for3Use2_13)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import scala.collection.immutable
// TreeMap is not available in Scala.js however it is needed for Time Zone support
// This is a simple implementation of NavigableMap, performance is likely terrible
private[bp] class ZoneMap[K: ClassTag, V] private[bp] (var map: immutable.TreeMap[K, V])(implicit
ordering: Ordering[K]
ordering: Ordering[K]
) extends AbstractMap[K, V]
with java.util.NavigableMap[K, V] {
def this()(implicit ordering: Ordering[K]) =
Expand Down Expand Up @@ -164,6 +164,6 @@ private[bp] class ZoneMap[K: ClassTag, V] private[bp] (var map: immutable.TreeMa
object ZoneMap {

def apply[K: ClassTag, V](map: immutable.TreeMap[K, V])(implicit
ordering: Ordering[K]
ordering: Ordering[K]
): java.util.NavigableMap[K, V] = new ZoneMap[K, V](map)
}
22 changes: 11 additions & 11 deletions tests/shared/src/test/scala/org/threeten/bp/AssertionsHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@ trait AssertionsHelper { this: AnyFunSuite =>
true

def assertEquals[A, B](
o1: A,
o2: B,
msg: String
o1: A,
o2: B,
msg: String
)(implicit prettifier: Prettifier, pos: source.Position): Assertion =
assert(o1 == o2, msg)

def assertEquals[A, B](
o1: A,
o2: B
o1: A,
o2: B
)(implicit prettifier: Prettifier, pos: source.Position): Assertion =
assert(o1 == o2)

def assertSame[A <: AnyRef, B <: AnyRef](
o1: A,
o2: B
o1: A,
o2: B
)(implicit prettifier: Prettifier, pos: source.Position): Assertion =
assert(o1 eq o2)

def assertNotEquals[A, B](
o1: A,
o2: B
o1: A,
o2: B
)(implicit prettifier: Prettifier, pos: source.Position): Assertion =
assert(o1 != o2)

Expand All @@ -51,8 +51,8 @@ trait AssertionsHelper { this: AnyFunSuite =>
assert(a == null)

def assertNotNull[A](
a: A,
msg: String
a: A,
msg: String
)(implicit prettifier: Prettifier, pos: source.Position): Assertion =
assert(a != null, msg)

Expand Down
12 changes: 6 additions & 6 deletions tests/shared/src/test/scala/org/threeten/bp/TestInstant.scala
Original file line number Diff line number Diff line change
Expand Up @@ -244,27 +244,27 @@ class TestInstant
List[Long](Long.MaxValue - 1,
0,
(Long.MaxValue - 1) / 1000,
((Long.MaxValue - 1) % 1000).toInt * 1000000
((Long.MaxValue - 1) % 1000).toInt * 1000000
),
List[Long](Long.MinValue,
0,
(Long.MinValue / 1000) - 1,
(Long.MinValue % 1000).toInt * 1000000 + 1000000000
(Long.MinValue % 1000).toInt * 1000000 + 1000000000
),
List[Long](Long.MinValue,
1,
(Long.MinValue / 1000) - 1,
(Long.MinValue % 1000).toInt * 1000000 + 1000000000 + 1
(Long.MinValue % 1000).toInt * 1000000 + 1000000000 + 1
),
List[Long](Long.MinValue + 1,
0,
((Long.MinValue + 1) / 1000) - 1,
((Long.MinValue + 1) % 1000).toInt * 1000000 + 1000000000
((Long.MinValue + 1) % 1000).toInt * 1000000 + 1000000000
),
List[Long](Long.MinValue + 1,
1,
((Long.MinValue + 1) / 1000) - 1,
((Long.MinValue + 1) % 1000).toInt * 1000000 + 1000000000 + 1
((Long.MinValue + 1) % 1000).toInt * 1000000 + 1000000000 + 1
)
)

Expand Down Expand Up @@ -730,7 +730,7 @@ class TestInstant
0,
Long.MinValue,
Long.MinValue / 1000 - 1,
(Long.MinValue % 1000).toInt * 1000000 + 1000000000
(Long.MinValue % 1000).toInt * 1000000 + 1000000000
)
)

Expand Down