Skip to content

Commit

Permalink
chore: Update scalafmt-core from 3.7.15 to 3.7.17 (#1792)
Browse files Browse the repository at this point in the history
* chore: Update scalafmt-core from 3.7.15 to 3.7.17

* Reformat with scalafmt 3.7.17

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs

---------

Co-authored-by: RenkuBot <RenkuBot@users.noreply.github.com>
  • Loading branch information
RenkuBot and RenkuBot authored Nov 17, 2023
1 parent e351fcc commit 28ca956
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ b20f0ba57795f003fe4d90817422e14b880d6c8c

# Scala Steward: Reformat with scalafmt 3.7.15
506650a1df56b0088fd732560ad1385670395f98

# Scala Steward: Reformat with scalafmt 3.7.17
36c18f272a4da509eb66c4202092999ea16729c9
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.15"
version = "3.7.17"

runner.dialect = "scala213"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import testentities._

object Generators {

val queryParams: Gen[Filters.Query] = nonBlankStrings(minLength = 5).map(v => Filters.Query(v.value))
val typeParams: Gen[Filters.EntityType] = Gen.oneOf(Filters.EntityType.all)
val sinceParams: Gen[Filters.Since] = localDatesNotInTheFuture.toGeneratorOf(Filters.Since)
val untilParams: Gen[Filters.Until] = localDatesNotInTheFuture.toGeneratorOf(Filters.Until)
val matchingScores: Gen[MatchingScore] = choose(MatchingScore.min.value, 10f).toGeneratorOf(MatchingScore)
val queryParams: Gen[Filters.Query] = nonBlankStrings(minLength = 5).map(v => Filters.Query(v.value))
val typeParams: Gen[Filters.EntityType] = Gen.oneOf(Filters.EntityType.all)
val sinceParams: Gen[Filters.Since] = localDatesNotInTheFuture.toGeneratorOf(Filters.Since)
val untilParams: Gen[Filters.Until] = localDatesNotInTheFuture.toGeneratorOf(Filters.Until)
val matchingScores: Gen[MatchingScore] = choose(MatchingScore.min.value, 10f).toGeneratorOf(MatchingScore)

val modelProjects: Gen[model.Entity.Project] = anyProjectEntities.map(_.to[model.Entity.Project])
val modelDatasets: Gen[model.Entity.Dataset] =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private object Generators {

implicit lazy val tsDatasetSearchInfoObjects: Gen[TSDatasetSearchInfo] = for {
topmostSameAs <- datasetTopmostSameAs
links <- linkObjectsGen(topmostSameAs).toGeneratorOfList(max = 2)
links <- linkObjectsGen(topmostSameAs).toGeneratorOfList(max = 2)
} yield TSDatasetSearchInfo(topmostSameAs, links)

def tsDatasetSearchInfoObjects(withLinkTo: projects.ResourceId, and: projects.ResourceId*): Gen[TSDatasetSearchInfo] =
Expand All @@ -115,9 +115,9 @@ private object Generators {
}(i)
}

def tsDatasetSearchInfoObjects(withLinkTo: entities.Project,
def tsDatasetSearchInfoObjects(withLinkTo: entities.Project,
topSameAsGen: Gen[datasets.TopmostSameAs] = datasetTopmostSameAs
): Gen[TSDatasetSearchInfo] =
): Gen[TSDatasetSearchInfo] =
tsDatasetSearchInfoObjects.map(_.copy(topmostSameAs = topSameAsGen.generateOne)).flatMap { si =>
linkObjectsGen(si.topmostSameAs)
.map(linkProjectId replace withLinkTo.resourceId)
Expand Down

0 comments on commit 28ca956

Please sign in to comment.