@@ -48,39 +48,44 @@ final case class ScalafixArgumentsImpl(args: Args = Args.default)
4848 }
4949 }
5050
51+ override def withRepositories (
52+ repositories : util.List [Repository ]
53+ ): ScalafixArguments =
54+ copy(args = args.copy(repositories = repositories.asScala.toList))
55+
5156 override def withRules (rules : util.List [String ]): ScalafixArguments =
5257 copy(args = args.copy(rules = rules.asScala.toList))
5358
5459 override def withToolClasspath (
5560 customURLs : util.List [URL ]
5661 ): ScalafixArguments =
57- withToolClasspath(
58- customURLs,
59- Nil .asJava,
60- Repository .defaults()
61- )
62+ withToolDependencyURLs(customURLs)
6263
6364 override def withToolClasspath (
6465 customURLs : util.List [URL ],
6566 customDependenciesCoordinates : util.List [String ]
6667 ): ScalafixArguments =
67- withToolClasspath(
68- customURLs,
69- customDependenciesCoordinates,
70- Repository .defaults()
71- )
68+ withToolDependencyCoordinates(customDependenciesCoordinates)
69+ .withToolDependencyURLs(customURLs)
7270
7371 override def withToolClasspath (
7472 customURLs : util.List [URL ],
7573 customDependenciesCoordinates : util.List [String ],
7674 repositories : util.List [Repository ]
7775 ): ScalafixArguments = {
76+ withRepositories(repositories)
77+ .withToolDependencyCoordinates(customDependenciesCoordinates)
78+ .withToolDependencyURLs(customURLs)
79+ }
7880
81+ override def withToolDependencyCoordinates (
82+ withToolDependencyCoordinates : java.util.List [String ]
83+ ): ScalafixArguments = {
7984 val OrganizeImportsCoordinates =
8085 """ com\.github\.liancheng.*:organize-imports:.*""" .r
8186
8287 val keptDependencies : Seq [String ] =
83- customDependenciesCoordinates .asScala
88+ withToolDependencyCoordinates .asScala
8489 .collect {
8590 case dep @ OrganizeImportsCoordinates () =>
8691 args.out.println(
@@ -107,7 +112,7 @@ final case class ScalafixArgumentsImpl(args: Args = Args.default)
107112 else Versions .scalaVersion
108113
109114 val customDependenciesJARs = ScalafixCoursier .toolClasspath(
110- repositories,
115+ args. repositories.asJava ,
111116 keptDependencies.asJava,
112117 scalaVersionForDependencies
113118 )
@@ -158,13 +163,23 @@ final case class ScalafixArgumentsImpl(args: Args = Args.default)
158163 }
159164 }
160165
161- val extraURLs = customURLs.asScala ++ customDependenciesJARs
166+ val extraURLs = customDependenciesJARs
162167 .getFiles()
163168 .asScala
164169 .map(_.toURI().toURL())
165170 val classLoader = new URLClassLoader (
166171 extraURLs.toArray,
167- getClass.getClassLoader
172+ args.toolClasspath
173+ )
174+ withToolClasspath(classLoader)
175+ }
176+
177+ override def withToolDependencyURLs (
178+ withToolDependencyURLs : java.util.List [java.net.URL ]
179+ ): ScalafixArguments = {
180+ val classLoader = new URLClassLoader (
181+ withToolDependencyURLs.asScala.toArray,
182+ args.toolClasspath
168183 )
169184 withToolClasspath(classLoader)
170185 }
0 commit comments