diff options
| author | Luck <git@lucko.me> | 2021-11-14 19:10:22 +0000 |
|---|---|---|
| committer | Luck <git@lucko.me> | 2021-11-14 19:10:22 +0000 |
| commit | eed8b8d38260fb16f114ab856e486904ae6dc937 (patch) | |
| tree | a0354f3d13452286c1be6d64342d673336c7de15 | |
| parent | c9f20a06d002567ca4d4b24c446c0ab384d8f79d (diff) | |
| download | spark-eed8b8d38260fb16f114ab856e486904ae6dc937.tar.gz spark-eed8b8d38260fb16f114ab856e486904ae6dc937.tar.bz2 spark-eed8b8d38260fb16f114ab856e486904ae6dc937.zip | |
Improve compile configuration again
| -rw-r--r-- | build.gradle | 7 | ||||
| -rw-r--r-- | spark-fabric/build.gradle | 8 | ||||
| -rw-r--r-- | spark-forge/build.gradle | 8 | ||||
| -rw-r--r-- | spark-velocity4/build.gradle | 8 | ||||
| -rw-r--r-- | spark-waterdog/build.gradle | 8 |
5 files changed, 13 insertions, 26 deletions
diff --git a/build.gradle b/build.gradle index 9360266..84a3a5e 100644 --- a/build.gradle +++ b/build.gradle @@ -17,14 +17,9 @@ subprojects { pluginDescription = 'spark is a performance profiling plugin/mod for Minecraft clients, servers and proxies.' } - java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } - } - tasks.withType(JavaCompile) { options.encoding = 'UTF-8' + options.release = 8 } processResources { diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle index 8dcd3fe..e848046 100644 --- a/spark-fabric/build.gradle +++ b/spark-fabric/build.gradle @@ -5,11 +5,9 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.0.0' } -java { - toolchain { - // override, compile targeting J16 - languageVersion = JavaLanguageVersion.of(16) - } +tasks.withType(JavaCompile) { + // override, compile targeting J16 + options.release = 16 } repositories { diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index 674e031..5646e47 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -14,11 +14,9 @@ plugins { apply plugin: 'net.minecraftforge.gradle' -java { - toolchain { - // override, compile targeting J16 - languageVersion = JavaLanguageVersion.of(16) - } +tasks.withType(JavaCompile) { + // override, compile targeting J16 + options.release = 16 } minecraft { diff --git a/spark-velocity4/build.gradle b/spark-velocity4/build.gradle index 00c837d..e2a0559 100644 --- a/spark-velocity4/build.gradle +++ b/spark-velocity4/build.gradle @@ -3,11 +3,9 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.0.0' } -java { - toolchain { - // override, compile targeting J11 - languageVersion = JavaLanguageVersion.of(11) - } +tasks.withType(JavaCompile) { + // override, compile targeting J11 + options.release = 11 } dependencies { diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle index c865ab8..07be15c 100644 --- a/spark-waterdog/build.gradle +++ b/spark-waterdog/build.gradle @@ -2,11 +2,9 @@ plugins { id 'com.github.johnrengelman.shadow' version '7.0.0' } -java { - toolchain { - // override, compile targeting J11 - languageVersion = JavaLanguageVersion.of(11) - } +tasks.withType(JavaCompile) { + // override, compile targeting J11 + options.release = 11 } dependencies { |