From f0c6f4cfa54c855f63d793d73bfd823cd290b214 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 26 Feb 2021 02:08:21 +0800 Subject: [PATCH] Set the log location of the transformer so it doesn't go into people's git --- gradle.properties | 2 +- .../shedaniel/architect/plugin/ArchitectPluginExtension.kt | 2 +- .../me/shedaniel/architect/plugin/TransformingTask.kt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3f4c37d..7815d51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official loom_version=0.6.67 -transformer_version=2.1.24 +transformer_version=2.1.26 base_version=3.0 \ No newline at end of file diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt index ec86bdc..c6482af 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt @@ -17,7 +17,7 @@ import java.util.jar.JarOutputStream import java.util.jar.Manifest open class ArchitectPluginExtension(val project: Project) { - var transformerVersion = "2.1.24" + var transformerVersion = "2.1.25" var injectablesVersion = "1.0.4" var minecraft = "" var injectInjectables = true diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt b/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt index 8a32393..bb46e84 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt @@ -3,9 +3,9 @@ package me.shedaniel.architect.plugin import me.shedaniel.architect.plugin.utils.GradleSupport import me.shedaniel.architectury.transformer.Transform import me.shedaniel.architectury.transformer.Transformer +import me.shedaniel.architectury.transformer.transformers.BuiltinProperties import org.gradle.api.Project import org.gradle.api.file.RegularFileProperty -import org.gradle.api.tasks.Input import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.Internal import org.gradle.api.tasks.TaskAction @@ -19,6 +19,7 @@ import kotlin.time.ExperimentalTime open class TransformingTask : Jar() { @InputFile val input: RegularFileProperty = GradleSupport.getFileProperty(project) + @Internal val transformers = mutableListOf() @@ -28,9 +29,10 @@ open class TransformingTask : Jar() { val input: Path = this.input.asFile.get().toPath() val output: Path = this.archiveFile.get().asFile.toPath() - project.extensions.getByType(ArchitectPluginExtension::class.java).properties().forEach { (key, value) -> + project.extensions.getByType(ArchitectPluginExtension::class.java).properties().forEach { (key, value) -> System.setProperty(key, value) } + System.setProperty(BuiltinProperties.LOCATION, project.file(".gradle").absolutePath) Transform.runTransformers(input, output, transformers) }