@@ -238,7 +238,7 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
238238 final gradleTestKit = project. dependencies. gradleTestKit()
239239 final localGroovy = project. dependencies. localGroovy()
240240
241- def hasExternalGradleApi = { @Nullable Configuration ... configurations ->
241+ def hasExternalGradleApi = { Set< Configuration > configurations ->
242242 for (var configuration in configurations) {
243243 if (configuration?. allDependencies?. find {
244244 (it. group == ' dev.gradleplugins' || it. group == ' name.remal.gradle-api' )
@@ -249,7 +249,7 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
249249 return false
250250 }
251251
252- def hasExternalGradleTestKit = { @Nullable Configuration ... configurations ->
252+ def hasExternalGradleTestKit = { Set< Configuration > configurations ->
253253 for (var configuration in configurations) {
254254 if (configuration?. allDependencies?. find {
255255 (it. group == ' dev.gradleplugins' || it. group == ' name.remal.gradle-api' )
@@ -260,7 +260,7 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
260260 return false
261261 }
262262
263- def hasExternalLocalGroovy = { @Nullable Configuration ... configurations ->
263+ def hasExternalLocalGroovy = { Set< Configuration > configurations ->
264264 for (var configuration in configurations) {
265265 if (configuration?. allDependencies?. find {
266266 it. group == ' name.remal.gradle-api'
@@ -271,7 +271,9 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
271271 return false
272272 }
273273
274- def processConfigurations = { @Nullable Configuration ... configurations ->
274+ def processConfigurations = { Set<Configuration > configurations ->
275+ if (configurations === null ) return
276+
275277 if (hasExternalGradleApi(configurations)) {
276278 for (var configuration in configurations) {
277279 configuration?. withDependencies { dependencies ->
@@ -302,14 +304,8 @@ import static net.minecraftforge.gradleutils.GradleUtilsPlugin.LOGGER
302304 }
303305
304306 for (var sourceSet in sourceSets) {
305- @Nullable var api = project. configurations. findByName(sourceSet. apiConfigurationName)
306- @Nullable var compileOnlyApi = project. configurations. findByName(sourceSet. compileOnlyApiConfigurationName)
307- @Nullable var implementation = project. configurations. findByName(sourceSet. implementationConfigurationName)
308- @Nullable var compileOnly = project. configurations. findByName(sourceSet. compileOnlyConfigurationName)
309- @Nullable var runtimeOnly = project. configurations. findByName(sourceSet. runtimeOnlyConfigurationName)
310-
311- processConfigurations(api, implementation, runtimeOnly)
312- processConfigurations(api, compileOnlyApi, implementation, compileOnly)
307+ processConfigurations(project. configurations. findByName(sourceSet. compileClasspathConfigurationName)?. hierarchy)
308+ processConfigurations(project. configurations. findByName(sourceSet. runtimeClasspathConfigurationName)?. hierarchy)
313309 }
314310 }
315311 }
0 commit comments