openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File sbt-new-ivy.patch of Package sbt (Revision 1ec7d5abd2836fa88500047378dd1c35)

Currently displaying revision 1ec7d5abd2836fa88500047378dd1c35 , Show latest

--- sbt-0.13.18/ivy/src/main/scala/sbt/FakeResolver.scala	2022-03-19 23:48:04.958817277 +0100
+++ sbt-0.13.18/ivy/src/main/scala/sbt/FakeResolver.scala	2022-03-19 23:59:45.280239339 +0100
@@ -149,10 +149,10 @@
         new RevisionEntry(module, v)
     }.toArray
 
-  override def listTokenValues(tokens: Array[String], criteria: java.util.Map[_, _]): Array[java.util.Map[_, _]] =
+  override def listTokenValues(tokens: Array[String], criteria: java.util.Map[String, Object]): Array[java.util.Map[String, String]] =
     Array.empty
 
-  override def listTokenValues(token: String, otherTokenValues: java.util.Map[_, _]): Array[String] =
+  override def listTokenValues(token: String, otherTokenValues: java.util.Map[String, String]): Array[String] =
     Array.empty
 
   override def locate(art: IvyArtifact): ArtifactOrigin = {
--- sbt-0.13.18/ivy/src/main/scala/sbt/IvyScala.scala	2022-03-19 23:48:04.958817277 +0100
+++ sbt-0.13.18/ivy/src/main/scala/sbt/IvyScala.scala	2022-03-19 23:49:53.052539689 +0100
@@ -162,7 +162,7 @@
   private[sbt] def excludeRule(organization: String, name: String, configurationNames: Iterable[String], excludeTypePattern: String): ExcludeRule =
     {
       val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", excludeTypePattern, "*")
-      val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, emptyMap[AnyRef, AnyRef])
+      val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, emptyMap[String, String])
       configurationNames.foreach(rule.addConfiguration)
       rule
     }
--- sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala	2022-03-19 23:48:05.034815675 +0100
+++ sbt-0.13.18/sbt-maven-resolver/src/main/scala/sbt/mavenint/MavenRepositoryResolver.scala	2022-03-20 00:07:58.037948041 +0100
@@ -380,7 +380,7 @@
           case other          => other
         }
         // Here we add the classifier, hopefully correctly...
-        val extraAtt = new java.util.HashMap[String, AnyRef]()
+        val extraAtt = new java.util.HashMap[String, String]()
         if (d.getArtifact.getClassifier != null) {
           extraAtt.put("m:classifier", d.getArtifact.getClassifier)
         }

Places

File sbt-new-ivy.patch of Package sbt (Revision 1ec7d5abd2836fa88500047378dd1c35)

Places