diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8780b804cc..2399b99e48 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -24,3 +24,6 @@ b20f0ba57795f003fe4d90817422e14b880d6c8c # Scala Steward: Reformat with scalafmt 3.7.15 506650a1df56b0088fd732560ad1385670395f98 + +# Scala Steward: Reformat with scalafmt 3.7.17 +36c18f272a4da509eb66c4202092999ea16729c9 diff --git a/.scalafmt.conf b/.scalafmt.conf index 8dffd459af..5c04695abc 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.15" +version = "3.7.17" runner.dialect = "scala213" diff --git a/entities-search/src/test/scala/io/renku/entities/search/Generators.scala b/entities-search/src/test/scala/io/renku/entities/search/Generators.scala index 04f331bbfb..b62f72e89a 100644 --- a/entities-search/src/test/scala/io/renku/entities/search/Generators.scala +++ b/entities-search/src/test/scala/io/renku/entities/search/Generators.scala @@ -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] = diff --git a/entities-search/src/test/scala/io/renku/entities/searchgraphs/datasets/Generators.scala b/entities-search/src/test/scala/io/renku/entities/searchgraphs/datasets/Generators.scala index 99a49d1a94..a6e68b8b3e 100644 --- a/entities-search/src/test/scala/io/renku/entities/searchgraphs/datasets/Generators.scala +++ b/entities-search/src/test/scala/io/renku/entities/searchgraphs/datasets/Generators.scala @@ -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] = @@ -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)