35
35
import org .jspecify .annotations .Nullable ;
36
36
37
37
import java .io .File ;
38
- import java .util .Comparator ;
39
- import java .util .HashSet ;
40
- import java .util .Set ;
41
- import java .util .stream .Stream ;
38
+ import java .util .*;
42
39
43
40
import static org .gradle .api .attributes .Bundling .BUNDLING_ATTRIBUTE ;
44
41
import static org .gradle .api .attributes .java .TargetJvmEnvironment .TARGET_JVM_ENVIRONMENT_ATTRIBUTE ;
@@ -155,14 +152,14 @@ private static void configureProject(Project project, RewriteExtension extension
155
152
156
153
private Set <File > getResolvedDependencies (Project project , RewriteExtension extension , Configuration rewriteConf ) {
157
154
if (resolvedDependencies == null ) {
158
- Dependency [] dependencies = Stream .concat (
159
- knownRewriteDependencies ( extension , project . getDependencies ()),
160
- rewriteConf .getDependencies (). stream ()
161
- ). toArray ( Dependency []:: new );
155
+ // Avoid Stream.concat here pending https://github.com/gradle/gradle/issues/33152
156
+ List < Dependency > dependencies = new ArrayList <>();
157
+ dependencies . addAll ( knownRewriteDependencies ( extension , project .getDependencies ()));
158
+ dependencies . addAll ( rewriteConf . getDependencies () );
162
159
// By using a detached configuration, we separate this dependency resolution from the rest of the project's
163
160
// configuration. This also means that Gradle has no criteria with which to select between variants of
164
161
// dependencies which expose differing capabilities. So those must be manually configured
165
- Configuration detachedConf = project .getConfigurations ().detachedConfiguration (dependencies );
162
+ Configuration detachedConf = project .getConfigurations ().detachedConfiguration (dependencies . toArray ( new Dependency [ 0 ]) );
166
163
167
164
try {
168
165
ObjectFactory objectFactory = project .getObjects ();
@@ -189,9 +186,9 @@ private Set<File> getResolvedDependencies(Project project, RewriteExtension exte
189
186
return resolvedDependencies ;
190
187
}
191
188
192
- private static Stream <Dependency > knownRewriteDependencies (RewriteExtension extension , DependencyHandler deps ) {
189
+ private static Collection <Dependency > knownRewriteDependencies (RewriteExtension extension , DependencyHandler deps ) {
193
190
String rewriteVersion = extension .getRewriteVersion ();
194
- return Stream . of (
191
+ return Arrays . asList (
195
192
deps .create ("org.openrewrite:rewrite-core:" + rewriteVersion ),
196
193
deps .create ("org.openrewrite:rewrite-groovy:" + rewriteVersion ),
197
194
deps .create ("org.openrewrite:rewrite-gradle:" + rewriteVersion ),
@@ -206,6 +203,7 @@ private static Stream<Dependency> knownRewriteDependencies(RewriteExtension exte
206
203
deps .create ("org.openrewrite:rewrite-maven:" + rewriteVersion ),
207
204
deps .create ("org.openrewrite:rewrite-properties:" + rewriteVersion ),
208
205
deps .create ("org.openrewrite:rewrite-protobuf:" + rewriteVersion ),
206
+ deps .create ("org.openrewrite:rewrite-toml:" + rewriteVersion ),
209
207
deps .create ("org.openrewrite:rewrite-xml:" + rewriteVersion ),
210
208
deps .create ("org.openrewrite:rewrite-yaml:" + rewriteVersion ),
211
209
deps .create ("org.openrewrite:rewrite-polyglot:" + extension .getRewritePolyglotVersion ()),
0 commit comments