From 16c04c57df4364471fa7dec6baac751be560bc01 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 13 Oct 2021 21:44:04 +0800 Subject: [PATCH] Make transformer add to runtimeClasspath instead of runtimeOnly Signed-off-by: shedaniel --- .../architectury/plugin/ArchitecturyPluginExtension.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt index f14040c..17a7d51 100644 --- a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt +++ b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt @@ -15,6 +15,7 @@ import dev.architectury.transformer.util.TransformerPair import org.gradle.api.Action import org.gradle.api.Project import org.gradle.api.artifacts.ModuleDependency +import org.gradle.api.plugins.JavaPlugin import org.gradle.api.tasks.bundling.AbstractArchiveTask import org.gradle.jvm.tasks.Jar import java.io.File @@ -136,12 +137,12 @@ open class ArchitectPluginExtension(val project: Project) { plsAddInjectables = true } val architecturyJavaAgents = project.configurations.create("architecturyJavaAgents") { - project.configurations.getByName("runtimeOnly").extendsFrom(it) + project.configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME).extendsFrom(it) } transformedLoom = true with(project.dependencies) { - add("runtimeOnly", "dev.architectury:architectury-transformer:$transformerVersion:runtime") + add(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, "dev.architectury:architectury-transformer:$transformerVersion:runtime") add( "architecturyJavaAgents", "dev.architectury:architectury-transformer:$transformerVersion:agent" @@ -236,12 +237,12 @@ open class ArchitectPluginExtension(val project: Project) { var plsAddInjectables = false project.configurations.findByName("architecturyTransformerClasspath") ?: project.configurations.create("architecturyTransformerClasspath") { - it.extendsFrom(project.configurations.getByName("compileClasspath")) + it.extendsFrom(project.configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)) plsAddInjectables = true } with(project.dependencies) { - add("compileOnly", "dev.architectury:architectury-injectables:$injectablesVersion") + add(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME, "dev.architectury:architectury-injectables:$injectablesVersion") if (plsAddInjectables) { add(