diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index b994ff1e..4f5a338d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -15,3 +15,6 @@ # Scala Steward: Reformat with scalafmt 3.8.4 1f703b5dae8779c51d97236fcbbde73767135a5b + +# Scala Steward: Reformat with scalafmt 3.10.3 +19d1c217b65e0c90591714be8e1e0bbdd5302a7c diff --git a/.scalafmt.conf b/.scalafmt.conf index 85831244..74158fe8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.6" +version = "3.10.3" style = default maxColumn = 100 diff --git a/core/shared/src/main/scala-2/java/util/Locale.scala b/core/shared/src/main/scala-2/java/util/Locale.scala index 939b8d0a..42ff0060 100644 --- a/core/shared/src/main/scala-2/java/util/Locale.scala +++ b/core/shared/src/main/scala-2/java/util/Locale.scala @@ -459,12 +459,12 @@ class Locale private[util] ( // Handle 2 special cases jp_JP_JP and th_TH_TH private[this] val extensions = if ( - ((language, country, variant)) == (("ja", "JP", "JP")) && + (language, country, variant) == (("ja", "JP", "JP")) && supportSpecialCases ) _extensions ++ SMap(Locale.UNICODE_LOCALE_EXTENSION -> "ca-japanese") else if ( - ((language, country, variant)) == (("th", "TH", "TH")) && + (language, country, variant) == (("th", "TH", "TH")) && supportSpecialCases ) _extensions ++ SMap(Locale.UNICODE_LOCALE_EXTENSION -> "nu-thai") diff --git a/tests/shared/src/test/scala/testsuite/javalib/util/CurrencyTest.scala b/tests/shared/src/test/scala/testsuite/javalib/util/CurrencyTest.scala index 34bd0910..bb0b8c6e 100644 --- a/tests/shared/src/test/scala/testsuite/javalib/util/CurrencyTest.scala +++ b/tests/shared/src/test/scala/testsuite/javalib/util/CurrencyTest.scala @@ -23,7 +23,7 @@ class CurrencyTest extends munit.FunSuite { jsNativeResults: CurrencyTestResults, jvmResults: CurrencyTestResults ) extends CombinedCurrencyTestResults - object LocaleCurrencyTest { + object LocaleCurrencyTest { def apply(locale: Locale, results: CurrencyTestResults): LocaleCurrencyTest = LocaleCurrencyTest(locale, results, results) } @@ -33,7 +33,7 @@ class CurrencyTest extends munit.FunSuite { jsNativeResults: CurrencyTestResults, jvmResults: CurrencyTestResults ) extends CombinedCurrencyTestResults - object CodeCurrencyTest { + object CodeCurrencyTest { def apply(currencyCode: String, results: CurrencyTestResults): CodeCurrencyTest = CodeCurrencyTest(currencyCode, results, results) }