From 4a421c775ea9a0adee383b76f0c0be8cce1027e0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 12 Nov 2022 15:42:32 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.6.1 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1436709ed..829504f8f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.5.9" +version = "3.6.1" style = default maxColumn = 100 From aa7db3a42121f78a5b3bed3658786c1cef83efe8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 12 Nov 2022 15:43:45 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.6.1 Executed command: scalafmt --non-interactive --- .../main/scala/java/util/SimpleTimeZone.scala | 4 ++-- .../src/main/scala/java/util/TimeZone.scala | 6 ++--- .../main/scala/java/util/SimpleTimeZone.scala | 4 ++-- .../src/main/scala/java/util/TimeZone.scala | 6 ++--- .../org/threeten/bp/temporal/IsoFields.scala | 24 +++++++++---------- .../main/scala/org/threeten/bp/ZoneId.scala | 2 +- .../bp/temporal/MockFieldNoValue.scala | 20 ++++++++-------- .../bp/format/GenTestPrinterParser.scala | 10 ++++---- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/core/js/src/main/scala/java/util/SimpleTimeZone.scala b/core/js/src/main/scala/java/util/SimpleTimeZone.scala index e85193b6d..a67b120b5 100644 --- a/core/js/src/main/scala/java/util/SimpleTimeZone.scala +++ b/core/js/src/main/scala/java/util/SimpleTimeZone.scala @@ -1,9 +1,9 @@ package java.util class SimpleTimeZone(rawOffset: Int, var ID: String) extends TimeZone { - override def getRawOffset = rawOffset + override def getRawOffset = rawOffset /* concrete methods */ - override def getID: String = ID + override def getID: String = ID override def setID(id: String): Unit = ID = id } diff --git a/core/js/src/main/scala/java/util/TimeZone.scala b/core/js/src/main/scala/java/util/TimeZone.scala index d7b484235..018118c6c 100644 --- a/core/js/src/main/scala/java/util/TimeZone.scala +++ b/core/js/src/main/scala/java/util/TimeZone.scala @@ -51,11 +51,11 @@ object TimeZone { new SimpleTimeZone(offsetInMillis, timeZone) } - def getDefault: TimeZone = default + def getDefault: TimeZone = default def setDefault(timeZone: TimeZone): Unit = default = timeZone def getTimeZone(timeZone: String): TimeZone = getTimeZone(ZoneId.of(timeZone)) - def getTimeZone(zoneId: ZoneId): TimeZone = { + def getTimeZone(zoneId: ZoneId): TimeZone = { val rules = zoneId.getRules val offsetInMillis = rules.getStandardOffset(Instant.now).getTotalSeconds * 1000 new SimpleTimeZone(offsetInMillis, zoneId.getId) @@ -80,7 +80,7 @@ abstract class TimeZone extends Serializable with Cloneable { // def useDaylightTime: Boolean /* concrete methods */ - def getID: String = ID + def getID: String = ID def setID(id: String): Unit = ID = id def getDisplayName(daylight: Boolean, style: Int, locale: Locale): String = { diff --git a/core/native/src/main/scala/java/util/SimpleTimeZone.scala b/core/native/src/main/scala/java/util/SimpleTimeZone.scala index e85193b6d..a67b120b5 100644 --- a/core/native/src/main/scala/java/util/SimpleTimeZone.scala +++ b/core/native/src/main/scala/java/util/SimpleTimeZone.scala @@ -1,9 +1,9 @@ package java.util class SimpleTimeZone(rawOffset: Int, var ID: String) extends TimeZone { - override def getRawOffset = rawOffset + override def getRawOffset = rawOffset /* concrete methods */ - override def getID: String = ID + override def getID: String = ID override def setID(id: String): Unit = ID = id } diff --git a/core/native/src/main/scala/java/util/TimeZone.scala b/core/native/src/main/scala/java/util/TimeZone.scala index 8dd3cdcc1..5d172d48e 100644 --- a/core/native/src/main/scala/java/util/TimeZone.scala +++ b/core/native/src/main/scala/java/util/TimeZone.scala @@ -13,11 +13,11 @@ object TimeZone { // TODO: implement this functionality, perhaps using https://github.com/scala-native/scala-native/blob/master/posixlib/src/main/scala/scala/scalanative/posix/time.scala new SimpleTimeZone(0, "UTC") - def getDefault: TimeZone = default + def getDefault: TimeZone = default def setDefault(timeZone: TimeZone): Unit = default = timeZone def getTimeZone(timeZone: String): TimeZone = getTimeZone(ZoneId.of(timeZone)) - def getTimeZone(zoneId: ZoneId): TimeZone = { + def getTimeZone(zoneId: ZoneId): TimeZone = { val rules = zoneId.getRules val offsetInMillis = rules.getStandardOffset(Instant.now).getTotalSeconds * 1000 new SimpleTimeZone(offsetInMillis, zoneId.getId) @@ -42,7 +42,7 @@ abstract class TimeZone extends Serializable with Cloneable { // def useDaylightTime: Boolean /* concrete methods */ - def getID: String = ID + def getID: String = ID def setID(id: String): Unit = ID = id def getDisplayName(daylight: Boolean, style: Int, locale: Locale): String = { diff --git a/core/shared/src/main/scala-2/org/threeten/bp/temporal/IsoFields.scala b/core/shared/src/main/scala-2/org/threeten/bp/temporal/IsoFields.scala index 57c6eefef..71b3a536b 100644 --- a/core/shared/src/main/scala-2/org/threeten/bp/temporal/IsoFields.scala +++ b/core/shared/src/main/scala-2/org/threeten/bp/temporal/IsoFields.scala @@ -259,13 +259,13 @@ object IsoFields { private def QY = "QuarterOfYear" lazy val QUARTER_OF_YEAR: Field = new Field("QUARTER_OF_YEAR", 1) { - override def toString: String = QY - def getBaseUnit: TemporalUnit = QUARTER_YEARS - def getRangeUnit: TemporalUnit = YEARS - def range: ValueRange = ValueRange.of(1, 4) - def isSupportedBy(temporal: TemporalAccessor): Boolean = + override def toString: String = QY + def getBaseUnit: TemporalUnit = QUARTER_YEARS + def getRangeUnit: TemporalUnit = YEARS + def range: ValueRange = ValueRange.of(1, 4) + def isSupportedBy(temporal: TemporalAccessor): Boolean = temporal.isSupported(MONTH_OF_YEAR) && isIso(temporal) - def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = range + def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = range def getFrom(temporal: TemporalAccessor): Long = { if (!temporal.isSupported(this)) throw unsupportedEx(QY) @@ -349,13 +349,13 @@ object IsoFields { new UnsupportedTemporalTypeException(s"Unsupported field: $f") lazy val WEEK_BASED_YEAR: Field = new Field("WEEK_BASED_YEAR", 3) { - override def toString: String = WBY - def getBaseUnit: TemporalUnit = WEEK_BASED_YEARS - def getRangeUnit: TemporalUnit = FOREVER - def range: ValueRange = YEAR.range - def isSupportedBy(temporal: TemporalAccessor): Boolean = + override def toString: String = WBY + def getBaseUnit: TemporalUnit = WEEK_BASED_YEARS + def getRangeUnit: TemporalUnit = FOREVER + def range: ValueRange = YEAR.range + def isSupportedBy(temporal: TemporalAccessor): Boolean = temporal.isSupported(EPOCH_DAY) && isIso(temporal) - def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = YEAR.range + def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = YEAR.range def getFrom(temporal: TemporalAccessor): Long = if (!temporal.isSupported(this)) throw unsupportedEx(WBY) diff --git a/core/shared/src/main/scala/org/threeten/bp/ZoneId.scala b/core/shared/src/main/scala/org/threeten/bp/ZoneId.scala index f9acc5429..4c24a006f 100644 --- a/core/shared/src/main/scala/org/threeten/bp/ZoneId.scala +++ b/core/shared/src/main/scala/org/threeten/bp/ZoneId.scala @@ -407,7 +407,7 @@ abstract class ZoneId private[bp] () extends Serializable { .appendZoneText(style) .toFormatter(locale) .format(new TemporalAccessor() { - def isSupported(field: TemporalField): Boolean = false + def isSupported(field: TemporalField): Boolean = false def getLong(field: TemporalField): Long = throw new UnsupportedTemporalTypeException(s"Unsupported field: $field") override def query[R](query: TemporalQuery[R]): R = diff --git a/tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala b/tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala index 31dd7ef06..e1739cabb 100644 --- a/tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala +++ b/tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala @@ -45,18 +45,18 @@ object MockFieldNoValue { final class MockFieldNoValue(name: String, ordinal: Int) extends Enum[MockFieldNoValue](name, ordinal) with TemporalField { - override def toString: String = null - def getBaseUnit: TemporalUnit = WEEKS - def getRangeUnit: TemporalUnit = MONTHS - def range: ValueRange = ValueRange.of(1, 20) - def isDateBased: Boolean = true - def isTimeBased: Boolean = false - def isSupportedBy(dateTime: TemporalAccessor): Boolean = true - def rangeRefinedBy(dateTime: TemporalAccessor): ValueRange = ValueRange.of(1, 20) - def getFrom(dateTime: TemporalAccessor): Long = throw new DateTimeException("Mock") + override def toString: String = null + def getBaseUnit: TemporalUnit = WEEKS + def getRangeUnit: TemporalUnit = MONTHS + def range: ValueRange = ValueRange.of(1, 20) + def isDateBased: Boolean = true + def isTimeBased: Boolean = false + def isSupportedBy(dateTime: TemporalAccessor): Boolean = true + def rangeRefinedBy(dateTime: TemporalAccessor): ValueRange = ValueRange.of(1, 20) + def getFrom(dateTime: TemporalAccessor): Long = throw new DateTimeException("Mock") def adjustInto[R <: Temporal](dateTime: R, newValue: Long): R = throw new DateTimeException("Mock") - override def getDisplayName(locale: Locale): String = "Mock" + override def getDisplayName(locale: Locale): String = "Mock" override def resolve( fieldValues: java.util.Map[TemporalField, java.lang.Long], partialTemporal: TemporalAccessor, diff --git a/tests/shared/src/test/scala/org/threeten/bp/format/GenTestPrinterParser.scala b/tests/shared/src/test/scala/org/threeten/bp/format/GenTestPrinterParser.scala index 29a821415..fcca0dfab 100644 --- a/tests/shared/src/test/scala/org/threeten/bp/format/GenTestPrinterParser.scala +++ b/tests/shared/src/test/scala/org/threeten/bp/format/GenTestPrinterParser.scala @@ -48,12 +48,12 @@ import org.threeten.bp.format.internal.TTBPDateTimePrintContext /** Abstract PrinterParser test. */ object GenTestPrinterParser { private val EMPTY: TemporalAccessor = new TemporalAccessor() { - def isSupported(field: TemporalField): Boolean = true - def getLong(field: TemporalField): Long = throw new DateTimeException("Mock") - override def get(field: TemporalField): Int = + def isSupported(field: TemporalField): Boolean = true + def getLong(field: TemporalField): Long = throw new DateTimeException("Mock") + override def get(field: TemporalField): Int = range(field).checkValidIntValue(getLong(field), field) - override def query[R](query: TemporalQuery[R]): R = query.queryFrom(this) - override def range(field: TemporalField): ValueRange = field.range + override def query[R](query: TemporalQuery[R]): R = query.queryFrom(this) + override def range(field: TemporalField): ValueRange = field.range } } From fb78e14b3d2c64cdc65a04fe395b9415fd2855b4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 12 Nov 2022 15:43:45 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.6.1' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..ac9b8c4ea --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.6.1 +aa7db3a42121f78a5b3bed3658786c1cef83efe8