diff --git a/build.gradle b/build.gradle index d2f5228..cdb877e 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ repositories { maven { url "https://maven.minecraftforge.net/" } maven { url "https://maven.shedaniel.me/" } gradlePluginPortal() + mavenLocal() } apply plugin: 'java-gradle-plugin' diff --git a/gradle.properties b/gradle.properties index 495c456..d42fab3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official loom_version=0.6.96 -transformer_version=2.3.43 -base_version=3.1 \ No newline at end of file +transformer_version=2.4.44 +base_version=3.2 \ 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 ad20d7d..1fcd9c7 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt @@ -19,7 +19,7 @@ import java.util.jar.JarOutputStream import java.util.jar.Manifest open class ArchitectPluginExtension(val project: Project) { - var transformerVersion = "2.3.43" + var transformerVersion = "2.4.44" var injectablesVersion = "1.0.8" 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 572d813..dd1097d 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/TransformingTask.kt @@ -33,7 +33,8 @@ 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(platform ?: throw NullPointerException("No Platform specified")).forEach { (key, value) -> + val extension = project.extensions.getByType(ArchitectPluginExtension::class.java) + extension.properties(platform ?: throw NullPointerException("No Platform specified")).forEach { (key, value) -> System.setProperty(key, value) } System.setProperty(BuiltinProperties.LOCATION, project.file(".gradle").absolutePath) @@ -69,3 +70,5 @@ fun Project.projectUniqueIdentifier(): String { if (project.rootProject != project) name = project.rootProject.name + "_" + name return "architectury_inject_${name}_$id".filter { Character.isJavaIdentifierPart(it) } } + +class Epic : RuntimeException()