Merge pull request #1643 from lwronski/fix-m1-fetch

lwronski · web-flow · commit 778ce6c4fef8 · 2022-12-05T20:31:59.000+01:00
Fix - merge extra repos with resolve.repositories
diff --git a/modules/options/src/main/scala/scala/build/internal/FetchExternalBinary.scala b/modules/options/src/main/scala/scala/build/internal/FetchExternalBinary.scala
@@ -45,7 +45,7 @@ object FetchExternalBinary {
               params.forcedVersions.map { case (m, v) => m.toCs -> v }*
             )
           }
-          .withRepositories(params.extraRepos)
+          .addRepositories(params.extraRepos: _*)
           .run()(archiveCache.cache.ec)
           .map(os.Path(_, os.pwd))
         ExternalBinary.ClassPath(javaCommand(), classPath, params.mainClass)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ object FetchExternalBinary {`
`45`	`45`	`params.forcedVersions.map { case (m, v) => m.toCs -> v }*`
`46`	`46`	`)`
`47`	`47`	`}`
`48`		`- .withRepositories(params.extraRepos)`
	`48`	`+ .addRepositories(params.extraRepos: _*)`
`49`	`49`	`.run()(archiveCache.cache.ec)`
`50`	`50`	`.map(os.Path(_, os.pwd))`
`51`	`51`	`ExternalBinary.ClassPath(javaCommand(), classPath, params.mainClass)`