mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 23:10:16 +01:00
[ci skip] Misc gradle updates (#6763)
This commit is contained in:
parent
f5b2d0cfce
commit
5eb18765ee
3 changed files with 5 additions and 10 deletions
|
@ -1,7 +1,7 @@
|
|||
plugins {
|
||||
java
|
||||
`maven-publish`
|
||||
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
|
||||
id("com.github.johnrengelman.shadow") version "7.1.0" apply false
|
||||
id("io.papermc.paperweight.core") version "1.1.12"
|
||||
}
|
||||
|
||||
|
|
|
@ -13,10 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
|
||||
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
|
||||
+import io.papermc.paperweight.tasks.BaseTask
|
||||
import io.papermc.paperweight.util.Git
|
||||
+import io.papermc.paperweight.util.defaultOutput
|
||||
+import io.papermc.paperweight.util.openZip
|
||||
import io.papermc.paperweight.util.path
|
||||
import io.papermc.paperweight.util.*
|
||||
import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
|
||||
+import java.nio.file.Files
|
||||
import java.util.Locale
|
||||
|
@ -62,6 +59,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+ abstract val outputJar: RegularFileProperty
|
||||
+
|
||||
+ override fun init() {
|
||||
+ super.init()
|
||||
+ outputJar.convention(defaultOutput())
|
||||
+ }
|
||||
+
|
||||
|
|
|
@ -34,8 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
@@ -0,0 +0,0 @@
|
||||
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
|
||||
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
|
||||
+import io.papermc.paperweight.util.Git
|
||||
+import io.papermc.paperweight.util.path
|
||||
+import io.papermc.paperweight.util.*
|
||||
+import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE
|
||||
+import java.util.Locale
|
||||
+
|
||||
|
@ -178,9 +177,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||
+ doFirst {
|
||||
+ workingDir.mkdirs()
|
||||
+ }
|
||||
+ javaLauncher.set(project.javaToolchains.launcherFor {
|
||||
+ languageVersion.set(JavaLanguageVersion.of(project.tasks.compileJava.get().options.release.get()))
|
||||
+ })
|
||||
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
|
||||
+ block(this)
|
||||
+}
|
||||
+
|
||||
|
|
Loading…
Reference in a new issue