diff --git a/README.md b/README.md index b14ed52..0a7c56a 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,6 @@ This project is licensed under [GNU GPL v3](/LICENSE). ## Version Compatibility | `Mindustry`/`Arc` | `EntityAnno` | |-------------------|----------------------| -| `v146` | `v146.0.0`, `v1.2.0` | +| `v146` | `v146.0.1`, `v1.2.0` | | `v145` | `1.1.2` | | `v144.3` | `1.0.0` | diff --git a/build.gradle b/build.gradle index f0f399f..d592e6a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ configure(allprojects){ sourceSets.main.java.srcDirs = [layout.projectDirectory.dir('src')] - version = 'v146.0.0' + version = 'v146.0.1' ext{ compilerVersion = JavaVersion.current().ordinal() - JavaVersion.VERSION_17.ordinal() + 17 diff --git a/src/ent/EntityAnnoPlugin.java b/src/ent/EntityAnnoPlugin.java index caefc3d..0566e02 100644 --- a/src/ent/EntityAnnoPlugin.java +++ b/src/ent/EntityAnnoPlugin.java @@ -11,7 +11,8 @@ import org.jetbrains.kotlin.gradle.internal.*; import org.jetbrains.kotlin.gradle.plugin.*; import org.jetbrains.kotlin.gradle.plugin.diagnostics.*; -import org.jetbrains.kotlin.gradle.tasks.*; +import org.jetbrains.kotlin.gradle.tasks.Kapt; +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile; import java.io.*; import java.util.concurrent.*; @@ -30,6 +31,10 @@ public void apply(Project project){ var exts = project.getExtensions(); var tasks = project.getTasks(); + var props = exts.getByType(ExtraPropertiesExtension.class); + // Don't include Kotlin standard libraries, we absolutely do not need those bloats. + props.set("kotlin.stdlib.default.dependency", "false"); + // Apply 'java', 'kotlin-jvm', and 'kotlin-kapt' plugins. plugins.apply("java"); plugins.apply(KotlinPluginWrapper.class); @@ -128,8 +133,11 @@ public void apply(Project project){ return null; }); - // Add fetched sources as KAPT input. - tasks.withType(Kapt.class, task -> task.getInputs().files(fetchComps)); + // Add fetched sources as KAPT input, and enable compile avoidance. + tasks.withType(Kapt.class, task -> { + task.getInputs().files(fetchComps); + task.getIncludeCompileClasspath().set(false); + }); // Add `fetchDir` and KAPT output as Java source sets. exts.getByType(JavaPluginExtension.class)