Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scalafmt-core to 3.7.9 #1216

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.7.9 #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcafd10
Update scalafmt-core to 3.7.9
scala-steward Jul 13, 2023
8f37c29
Reformat with scalafmt 3.7.9
scala-steward Jul 13, 2023
3b06539
Add 'Reformat with scalafmt 3.7.9' to .git-blame-ignore-revs
scala-steward Jul 13, 2023
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
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.9
8f37c295e78493db6691365005e50929cda49eaa
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.2"
version = "3.7.9"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
10 changes: 5 additions & 5 deletions magnolia/shared/src/test/scala-dotty/zio/config/magnolia/AutomaticConfigSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ object AutomaticConfigTestUtils {
private val genCurrency: Gen[Any, Currency] = Gen.double(10.0, 20.0).map(Currency.apply)
private val genPrice: Gen[Any, Price] = Gen.oneOf(genPriceDescription, genCurrency)

private val genToken = Gen.const(Token("someToken"))
private val genPassword = Gen.const(Password("some passeword"))
private val genToken = Gen.const(Token("someToken"))
private val genPassword = Gen.const(Password("some passeword"))
private val genInstanceProfile = Gen.const(InstanceProfile)
private val genCredentials = Gen.oneOf(genToken, genPassword, genInstanceProfile)
private val genCredentials = Gen.oneOf(genToken, genPassword, genInstanceProfile)

private val genDbUrl = Gen.const(DbUrl("dburl"))

Expand Down Expand Up @@ -112,9 +112,9 @@ object AutomaticConfigTestUtils {
) ++ (aws.security match {
case Password(password) =>
Map("aws.security.type" -> "Password", "aws.security.value" -> password)
case Token(token) =>
case Token(token) =>
Map("aws.security.type" -> "Token", "aws.security.value" -> token)
case InstanceProfile =>
case InstanceProfile =>
Map("aws.security.type" -> "InstanceProfile")
}) ++ amount.map(double => ("amount", double.toString)).toList
} yield (default, anotherDefault) match {
Expand Down
2 changes: 1 addition & 1 deletion ...e-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigErrorsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ object TypesafeConfigErrorsSpec extends ZIOSpecDefault {
// assert(notWellFormedConfigResult.isLeft)(Assertion.isTrue)
// },
test("A variant error case with typesafe HOCON config and a manual description") {
val configNestedManual = {
val configNestedManual = {
val accountConfig =
(string("region") zip string("accountId")).to[Account]

Expand Down
191 changes: 106 additions & 85 deletions ...afe-magnolia-tests/shared/src/test/scala/zio/config/typesafe/TypesafeConfigListTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@ object TypesafeConfigListTest extends ZIOSpecDefault {
|""".stripMargin

final case class Details3(
ci: String,
vi: Either[Int, Either[Long, Either[Double, Either[Float, String]]]],
lst: List[Int],
vvv: Option[List[Int]]
)
ci: String,
vi: Either[Int, Either[Long, Either[Double, Either[Float, String]]]],
lst: List[Int],
vvv: Option[List[Int]]
)
final case class Details2(hi: String, bi: String, r: List[Details3])
final case class Details1(
table: String,
columns: List[String],
extraDetails: List[Details2]
)
table: String,
columns: List[String],
extraDetails: List[Details2]
)
final case class ExportDetails(exportDetails: List[Details1], database: Database)
final case class Port(va: String)
final case class Database(port: Port)
Expand All @@ -147,85 +147,106 @@ object TypesafeConfigListTest extends ZIOSpecDefault {

val expectedResult =
ExportDetails(
exportDetails = List(Details1(
table = "some_name",
columns = List("a", "b", "c", "d"),
extraDetails = List(Details2(
hi = "di",
bi = "ci",
r = List(Details3(
ci = "ki",
vi = Right(value = Right(value = Right(value = Right(value = "bi")))),
lst = List(1, 1, 1),
vvv = Some(Nil)
), Details3(
ci = "ki",
vi = Right(value = Right(value = Left(value = 1.0882121))),
lst = List(1, 2, 1),
vvv = None
), Details3(
ci = "ki",
vi = Left(value = 3),
lst = List(1, 3, 5),
vvv = Some(List(1, 2, 3))
))
), Details2(
hi = "di",
bi = "ci",
r = List(Details3(
ci = "ki",
vi = Right(value = Right(value = Right(value = Right(value = "bi")))),
lst = List(1, 1, 1),
vvv = Some(Nil)
), Details3(
ci = "ki",
vi = Right(value = Right(value = Left(value = 1.0882121))),
lst = List(1, 2, 1),
vvv = None
), Details3(
ci = "ki",
vi = Left(value = 3),
lst = List(1, 3, 5),
vvv = Some(List(1, 2, 3))
))
), Details2(
hi = "di",
bi = "ci",
r = Nil
))
), Details1(
table = "some_name1",
columns = Nil,
extraDetails = List(Details2(
hi = "di",
bi = "ci",
r = Nil
), Details2(
hi = "di",
bi = "ci",
r = Nil
), Details2(
hi = "di",
bi = "ci",
r = Nil
))
), Details1(
table = "some_name1",
columns = Nil,
extraDetails = Nil
), Details1(
table = "some_name2",
columns = Nil,
extraDetails = Nil
), Details1(
table = "some_name2",
columns = Nil,
extraDetails = Nil
)),
exportDetails = List(
Details1(
table = "some_name",
columns = List("a", "b", "c", "d"),
extraDetails = List(
Details2(
hi = "di",
bi = "ci",
r = List(
Details3(
ci = "ki",
vi = Right(value = Right(value = Right(value = Right(value = "bi")))),
lst = List(1, 1, 1),
vvv = Some(Nil)
),
Details3(
ci = "ki",
vi = Right(value = Right(value = Left(value = 1.0882121))),
lst = List(1, 2, 1),
vvv = None
),
Details3(
ci = "ki",
vi = Left(value = 3),
lst = List(1, 3, 5),
vvv = Some(List(1, 2, 3))
)
)
),
Details2(
hi = "di",
bi = "ci",
r = List(
Details3(
ci = "ki",
vi = Right(value = Right(value = Right(value = Right(value = "bi")))),
lst = List(1, 1, 1),
vvv = Some(Nil)
),
Details3(
ci = "ki",
vi = Right(value = Right(value = Left(value = 1.0882121))),
lst = List(1, 2, 1),
vvv = None
),
Details3(
ci = "ki",
vi = Left(value = 3),
lst = List(1, 3, 5),
vvv = Some(List(1, 2, 3))
)
)
),
Details2(
hi = "di",
bi = "ci",
r = Nil
)
)
),
Details1(
table = "some_name1",
columns = Nil,
extraDetails = List(
Details2(
hi = "di",
bi = "ci",
r = Nil
),
Details2(
hi = "di",
bi = "ci",
r = Nil
),
Details2(
hi = "di",
bi = "ci",
r = Nil
)
)
),
Details1(
table = "some_name1",
columns = Nil,
extraDetails = Nil
),
Details1(
table = "some_name2",
columns = Nil,
extraDetails = Nil
),
Details1(
table = "some_name2",
columns = Nil,
extraDetails = Nil
)
),
database = Database(port = Port(va = "ba"))
)


assertZIO(zioConfigWithKeysInKebabResult)(equalTo(expectedResult))
}
)
Expand Down