Skip to content

Commit a31d36a

Browse files
committed
Only include the java.time classes on the package
1 parent 3a57442 commit a31d36a

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ lazy val commonSettings = Seq(
3737
"-feature",
3838
"-encoding", "UTF-8",
3939
),
40+
// Don't include threeten on the binaries
41+
mappings in (Compile, packageBin) := (mappings in (Compile, packageBin)).value.filter { case (f, s) => !s.contains("semanticdb") && !s.contains("threeten") },
4042
scalacOptions := {
4143
CrossVersion.partialVersion(scalaVersion.value) match {
4244
case Some((2, scalaMajor)) if scalaMajor >= 11 =>

core/js/src/main/scala/java/util/Calendar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package java.util
22

3-
import org.threeten.bp.Instant
3+
import java.time.Instant
44

55
@SerialVersionUID(-1807547505821590642L)
66
abstract class Calendar private[util](timezone: TimeZone = null, locale: Locale = null) extends Cloneable with Serializable with Ordered[Calendar] {

core/js/src/main/scala/java/util/GregorianCalendar.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package java.util
22

3-
import org.threeten.bp.ZonedDateTime
3+
import java.time.ZonedDateTime
44

55
@SerialVersionUID(-8125100834729963327L)
66
class GregorianCalendar(timezone: TimeZone = TimeZone.getDefault, locale: Locale = Locale.getDefault) extends Calendar(timezone, locale) {

core/js/src/main/scala/java/util/TimeZone.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package java.util
22

33
import java.text.DateFormatSymbols
44

5-
import org.threeten.bp.{Instant, ZoneId}
6-
import org.threeten.bp.zone.ZoneRulesProvider
5+
import java.time.{Instant, ZoneId}
6+
import java.time.zone.ZoneRulesProvider
77

88
import scala.collection.JavaConverters._
99
import scala.util.Try

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.1")
2121

2222
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.10")
2323

24-
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.1.1")
24+
addSbtPlugin("io.github.cquiroz" % "sbt-tzdb" % "0.1.2")
2525

2626
// Incompatible with 2.12.0-M5
2727
// addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")

0 commit comments

Comments
 (0)