Skip to content

Commit 1cad709

Browse files
authored
Merge pull request #450 from xuwei-k/sbt-2-warnings
[2.x] fix warnings
2 parents 44e234b + fdaa662 commit 1cad709

File tree

18 files changed

+69
-50
lines changed

18 files changed

+69
-50
lines changed

core/src/main/scala/sbt/librarymanagement/ConflictWarning.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ object ConflictWarning {
4444
/** Map from (organization, rawName) to set of multiple full names. */
4545
def crossVersionMismatches(report: UpdateReport): Map[(String, String), Set[String]] = {
4646
val mismatches = report.configurations.flatMap { confReport =>
47-
groupByRawName(confReport.allModules).mapValues { modules =>
47+
groupByRawName(confReport.allModules).view.mapValues { modules =>
4848
val differentFullNames = modules.map(_.name).toSet
4949
if (differentFullNames.size > 1) differentFullNames else Set.empty[String]
5050
}

core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface
186186
// The artifacts that came from Ivy don't have their classifier set, let's set it according to
187187
// FIXME: this is only done because IDE plugins depend on `classifier` to determine type. They
188188
val typeClassifierMap: Map[String, String] =
189-
((sourceArtifactTypes.toIterable map (_ -> Artifact.SourceClassifier))
190-
:: (docArtifactTypes.toIterable map (_ -> Artifact.DocClassifier)) :: Nil).flatten.toMap
189+
((sourceArtifactTypes.toSeq map (_ -> Artifact.SourceClassifier))
190+
:: (docArtifactTypes.toSeq map (_ -> Artifact.DocClassifier)) :: Nil).flatten.toMap
191191
Right(r.substitute { (conf, mid, artFileSeq) =>
192192
artFileSeq map { case (art, f) =>
193193
// Deduce the classifier from the type if no classifier is present already

core/src/main/scala/sbt/librarymanagement/ModuleIDExtra.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private[librarymanagement] abstract class ModuleIDExtra {
6464

6565
/** Returns the extra attributes except for ones marked as information only (ones that typically would not be used for dependency resolution). */
6666
def extraDependencyAttributes: Map[String, String] =
67-
extraAttributes.filterKeys(!_.startsWith(SbtPomExtraProperties.POM_INFO_KEY_PREFIX)).toMap
67+
extraAttributes.view.filterKeys(!_.startsWith(SbtPomExtraProperties.POM_INFO_KEY_PREFIX)).toMap
6868

6969
@deprecated(
7070
"Use `cross(CrossVersion)`, the variant accepting a CrossVersion value constructed by a member of the CrossVersion object instead.",

ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import org.apache.ivy.core.module.descriptor.DefaultArtifact
3535
import org.apache.ivy.core.report.DownloadReport
3636
import org.apache.ivy.plugins.resolver.util.{ ResolvedResource, ResourceMDParser }
3737
import org.apache.ivy.util.{ ChecksumHelper, FileUtil, Message }
38-
import scala.collection.JavaConverters._
38+
import scala.jdk.CollectionConverters._
3939
import sbt.internal.librarymanagement.mavenint.PomExtraDependencyAttributes
4040
import sbt.io.IO
4141
import sbt.util.Logger

ivy/src/main/scala/sbt/internal/librarymanagement/CustomPomParser.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ object CustomPomParser {
171171
// The extra sbt plugin metadata in pom.xml does not need to be readable by maven, but the other information may be.
172172
// However, the pom.xml needs to be valid in all cases because other tools like repository managers may read the pom.xml.
173173
private[sbt] def getPomProperties(md: ModuleDescriptor): Map[String, String] = {
174-
import collection.JavaConverters._
174+
import scala.jdk.CollectionConverters._
175175
PomModuleDescriptorBuilder
176176
.extractPomProperties(md.getExtraInfo)
177177
.asInstanceOf[java.util.Map[String, String]]
@@ -182,13 +182,13 @@ object CustomPomParser {
182182
(propertyAttributes - ExtraAttributesKey) map { case (k, v) => ("e:" + k, v) }
183183

184184
private[this] def shouldBeUnqualified(m: Map[String, String]): Map[String, String] =
185-
m.filterKeys(unqualifiedKeys).toMap
185+
m.view.filterKeys(unqualifiedKeys).toMap
186186

187187
private[this] def addExtra(
188188
properties: Map[String, String],
189189
id: ModuleRevisionId
190190
): ModuleRevisionId = {
191-
import collection.JavaConverters._
191+
import scala.jdk.CollectionConverters._
192192
val oldExtra = qualifiedExtra(id)
193193
val newExtra = (oldExtra ++ properties).asJava
194194
// remove the sbt plugin cross version from the resolved ModuleRevisionId
@@ -211,9 +211,9 @@ object CustomPomParser {
211211
def qualifiedExtra(item: ExtendableItem): Map[String, String] =
212212
PomExtraDependencyAttributes.qualifiedExtra(item)
213213
def filterCustomExtra(item: ExtendableItem, include: Boolean): Map[String, String] =
214-
(qualifiedExtra(item) filterKeys { k =>
214+
qualifiedExtra(item).view.filterKeys { k =>
215215
qualifiedIsExtra(k) == include
216-
}).toMap
216+
}.toMap
217217

218218
def writeDependencyExtra(s: Seq[DependencyDescriptor]): Seq[String] =
219219
PomExtraDependencyAttributes.writeDependencyExtra(s)
@@ -275,7 +275,7 @@ object CustomPomParser {
275275
case None => dd
276276
}
277277

278-
import collection.JavaConverters._
278+
import scala.jdk.CollectionConverters._
279279
def addExtra(
280280
properties: Map[String, String],
281281
dependencyExtra: Map[ModuleRevisionId, Map[String, String]],

ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ private[sbt] object IvySbt {
561561
* Clearly, it would be better to have an explicit option in Ivy to control this.
562562
*/
563563
def hasImplicitClassifier(artifact: IArtifact): Boolean = {
564-
import scala.collection.JavaConverters._
564+
import scala.jdk.CollectionConverters._
565565
artifact.getQualifiedExtraAttributes.asScala.keys
566566
.exists(_.asInstanceOf[String] startsWith "m:")
567567
}
@@ -795,7 +795,7 @@ private[sbt] object IvySbt {
795795
artifact
796796
}
797797
def getExtraAttributes(revID: ExtendableItem): Map[String, String] = {
798-
import scala.collection.JavaConverters._
798+
import scala.jdk.CollectionConverters._
799799
revID.getExtraAttributes.asInstanceOf[java.util.Map[String, String]].asScala.toMap
800800
}
801801
private[sbt] def extra(
@@ -808,7 +808,7 @@ private[sbt] object IvySbt {
808808
javaMap(ea.extraAttributes, unqualify)
809809
}
810810
private[sbt] def javaMap(m: Map[String, String], unqualify: Boolean = false) = {
811-
import scala.collection.JavaConverters._
811+
import scala.jdk.CollectionConverters._
812812
val map = if (unqualify) m map { case (k, v) => (k.stripPrefix("e:"), v) }
813813
else m
814814
if (map.isEmpty) null else map.asJava
@@ -962,9 +962,9 @@ private[sbt] object IvySbt {
962962
deps.put(id, updated)
963963
}
964964

965-
import scala.collection.JavaConverters._
965+
import scala.jdk.CollectionConverters._
966966
deps.values.asScala.toSeq.flatMap { dds =>
967-
val mergeable = (dds, dds.tail).zipped.forall(ivyint.MergeDescriptors.mergeable _)
967+
val mergeable = dds.lazyZip(dds.tail).forall(ivyint.MergeDescriptors.mergeable _)
968968
if (mergeable) dds.reverse.reduceLeft(ivyint.MergeDescriptors.apply _) :: Nil else dds
969969
}
970970
}

ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ object IvyActions {
236236
}.toMap
237237

238238
def grouped[T](grouping: ModuleID => T)(mods: Seq[ModuleID]): Map[T, Set[String]] =
239-
mods.groupBy(grouping).mapValues(_.map(_.revision).toSet).toMap
239+
mods.groupBy(grouping).view.mapValues(_.map(_.revision).toSet).toMap
240240

241241
def addExcluded(
242242
report: UpdateReport,

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private[sbt] class CachedResolutionResolveCache {
158158
(md1, IvySbt.isChanging(dd) || internalDependency(dd, prOpt).isDefined, dd)
159159
}
160160
def extractOverrides(md0: ModuleDescriptor): Vector[IvyOverride] = {
161-
import scala.collection.JavaConverters._
161+
import scala.jdk.CollectionConverters._
162162
md0.getAllDependencyDescriptorMediators.getAllRules.asScala.toSeq.toVector sortBy {
163163
case (k, _) =>
164164
k.toString

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/IvyCredentialsLookup.scala

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package sbt.internal.librarymanagement
22
package ivyint
33

44
import org.apache.ivy.util.url.CredentialsStore
5-
import collection.JavaConverters._
5+
import scala.jdk.CollectionConverters._
66

77
/** A key used to store credentials in the ivy credentials store. */
88
private[sbt] sealed trait CredentialKey
@@ -56,11 +56,16 @@ private[sbt] object IvyCredentialsLookup {
5656
* A mapping of host -> realms in the ivy credentials store.
5757
*/
5858
def realmsForHost: Map[String, Set[String]] =
59-
(keyringKeys collect { case x: Realm =>
60-
x
61-
} groupBy { realm =>
62-
realm.host
63-
} mapValues { realms =>
64-
realms map (_.realm)
65-
}).toMap
59+
keyringKeys
60+
.collect { case x: Realm =>
61+
x
62+
}
63+
.groupBy { realm =>
64+
realm.host
65+
}
66+
.view
67+
.mapValues { realms =>
68+
realms map (_.realm)
69+
}
70+
.toMap
6671
}

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private[sbt] class ParallelResolveEngine(
4040
artifactFilter: Filter,
4141
options: DownloadOptions
4242
): Unit = {
43-
import scala.collection.JavaConverters._
43+
import scala.jdk.CollectionConverters._
4444
val start = System.currentTimeMillis
4545
report.getArtifacts match {
4646
case typed: java.util.List[Artifact @unchecked] =>

0 commit comments

Comments
 (0)