File tree 3 files changed +16
-6
lines changed
main/scala/org/scalasteward/core
test/scala/org/scalasteward/core/update
3 files changed +16
-6
lines changed Original file line number Diff line number Diff line change @@ -37,5 +37,5 @@ package object data {
37
37
val scalaLangModules : List [(GroupId , ArtifactId )] =
38
38
scala2LangModules ++ scala3LangModules
39
39
40
- val scalaNextMinVersion : Version = Version (" 3.4.0" )
40
+ val scalaNextMinVersion : Version = Version (" 3.4.0-NIGHTLY " )
41
41
}
Original file line number Diff line number Diff line change @@ -79,13 +79,14 @@ object FilterAlg {
79
79
val filteredVersions = update.newerVersions.filterNot(_ >= scalaNextMinVersion)
80
80
if (filteredVersions.nonEmpty)
81
81
Right (update.copy(newerVersions = Nel .fromListUnsafe(filteredVersions)))
82
- else Left (IgnoreScalaNext (update))
82
+ else
83
+ Left (IgnoreScalaNext (update))
83
84
}
84
85
}
85
86
86
87
def isScala3Lang (update : Update .ForArtifactId ): Boolean =
87
88
scala3LangModules.exists { case (g, a) =>
88
- update.groupId == g && update.artifactIds.exists(_ == a)
89
+ update.groupId == g && update.artifactIds.exists(_.name == a.name )
89
90
}
90
91
91
92
private def globalFilter (update : Update .ForArtifactId , repoConfig : RepoConfig ): FilterResult =
Original file line number Diff line number Diff line change @@ -254,17 +254,26 @@ class FilterAlgTest extends FunSuite {
254
254
255
255
test(" scalaLTSFilter: LTS, filter versions" ) {
256
256
val update =
257
- (" org.scala-lang" .g % " scala3-compiler" .a % " 3.3.2" %> Nel .of(" 3.3.3" , " 3.4.0" )).single
257
+ (" org.scala-lang" .g % (" scala3-compiler" , " scala3-compiler_3" ).a % " 3.3.2" %> Nel .of(
258
+ " 3.3.3" ,
259
+ " 3.4.0"
260
+ )).single
258
261
assertEquals(scalaLTSFilter(update), Right (update.copy(newerVersions = Nel .of(" 3.3.3" .v))))
259
262
}
260
263
261
264
test(" scalaLTSFilter: Next" ) {
262
- val update = (" org.scala-lang" .g % " scala3-compiler" .a % " 3.4.0" %> Nel .of(" 3.4.1" )).single
265
+ val update =
266
+ (" org.scala-lang" .g % (" scala3-compiler" , " scala3-compiler_3" ).a % " 3.4.0" %> Nel .of(
267
+ " 3.4.1"
268
+ )).single
263
269
assertEquals(scalaLTSFilter(update), Right (update))
264
270
}
265
271
266
272
test(" isScala3Lang: true" ) {
267
- val update = (" org.scala-lang" .g % " scala3-compiler" .a % " 3.3.3" %> Nel .of(" 3.4.0" )).single
273
+ val update =
274
+ (" org.scala-lang" .g % (" scala3-compiler" , " scala3-compiler_3" ).a % " 3.3.3" %> Nel .of(
275
+ " 3.4.0"
276
+ )).single
268
277
assert(isScala3Lang(update))
269
278
}
270
279
You can’t perform that action at this time.
0 commit comments