luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7815 from xuwei-k/CompatParColls 

[2.x] delete `sbt.internal.CompatParColls`
This commit is contained in:
eugene yokota 2024-10-22 23:52:14 -04:00 committed by GitHub
parent c2a0f162ee 34832a1c3e
commit efc41bd8d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/src/main/scala/sbt/internal/CompatParColls.scala
View File

@ -1,26 +0,0 @@
/*
* sbt
* Copyright 2023, Scala center
* Copyright 2011 - 2022, Lightbend, Inc.
* Copyright 2008 - 2010, Mark Harrah
* Licensed under Apache License 2.0 (see LICENSE)
*/
package sbt.internal
import scala.annotation.nowarn
// https://github.com/scala/scala-parallel-collections/issues/22
private[sbt] object CompatParColls {
@nowarn
val Converters = {
import Compat._
{
import scala.collection.parallel._
CollectionConverters
}
}
object Compat {
object CollectionConverters
}
}

4
main/src/main/scala/sbt/internal/KeyIndex.scala
View File

@ -24,7 +24,7 @@ object KeyIndex {
projects: Map[URI, Set[String]],
configurations: Map[String, Seq[Configuration]]
): ExtendableKeyIndex = {
import sbt.internal.CompatParColls.Converters._
import scala.collection.parallel.CollectionConverters.*
known.par.foldLeft(base(projects, configurations)) { _ add _ }
}
@ -42,7 +42,7 @@ object KeyIndex {
* This was a significant serial bottleneck during project loading that we can work around by
* computing the aggregations in parallel and then bulk adding them to the index.
*/
import sbt.internal.CompatParColls.Converters._
import scala.collection.parallel.CollectionConverters.*
val toAggregate = known.par.map {
case key if validID(key.key.label) =>
Aggregation.aggregate(key, ScopeMask(), extra, reverse = true)

2
main/src/main/scala/sbt/internal/server/Definition.scala
View File

@ -279,7 +279,7 @@ private[sbt] object Definition {
log.debug(s"symbol $sym")
analyses
.map { analyses =>
import sbt.internal.CompatParColls.Converters._
import scala.collection.parallel.CollectionConverters.*
val locations = analyses.par.flatMap { analysis =>
val selectPotentials = textProcessor.potentialClsOrTraitOrObj(sym)
val classes =

2
main/src/main/scala/sbt/nio/Settings.scala
View File

@ -297,7 +297,7 @@ private[sbt] object Settings {
* input key.
*/
private[sbt] def fileStamps(scopedKey: Def.ScopedKey[_]): Def.Setting[_] = {
import sbt.internal.CompatParColls.Converters._
import scala.collection.parallel.CollectionConverters.*
val scope = scopedKey.scope
addTaskDefinition(scope / Keys.inputFileStamps := {
val cache = (scope / unmanagedFileStampCache).value

2
scripted-sbt/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
View File

@ -590,7 +590,7 @@ class ScriptedRunner {
val scriptedRunners =
runner.batchScriptedRunner(scriptedTests, addTestFile, groupCount, prop, logger)
if (parallelExecution && instances > 1) {
import sbt.internal.CompatParColls.Converters._
import scala.collection.parallel.CollectionConverters.*
val parallelRunners = scriptedRunners.toArray.par
parallelRunners.tasksupport = new ForkJoinTaskSupport(new ForkJoinPool(instances))
runAll(parallelRunners)