Merge pull request #2724 from Lucwousin/injector-cache

gradle: update injector version
This commit is contained in:
Lucwousin
2020-06-28 14:41:32 +02:00
committed by GitHub
2 changed files with 9 additions and 9 deletions

View File

@@ -35,7 +35,7 @@ buildscript {
dependencies { dependencies {
classpath("org.ajoberstar.grgit:grgit-core:4.0.2") classpath("org.ajoberstar.grgit:grgit-core:4.0.2")
classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
classpath("com.openosrs:injector-plugin:1.1.2") classpath("com.openosrs:injector-plugin:1.1.3")
} }
} }
@@ -169,6 +169,13 @@ subprojects {
withSourcesJar() withSourcesJar()
} }
withType<AbstractArchiveTask> {
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
dirMode = 493
fileMode = 420
}
withType<JavaCompile> { withType<JavaCompile> {
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }

View File

@@ -62,14 +62,10 @@ injector {
vanilla.set(vanillaDep.singleFile) vanilla.set(vanillaDep.singleFile)
} }
artifacts {
runtimeElements(tasks.inject.get().output)
}
// keep the sourcesets etc but remove useless tasks // keep the sourcesets etc but remove useless tasks
tasks { tasks {
inject { inject {
dependsOn(configurations["combined"]) dependsOn(combined)
} }
classes { classes {
enabled = false enabled = false
@@ -86,7 +82,4 @@ tasks {
processResources { processResources {
enabled = false enabled = false
} }
assemble {
finalizedBy("inject")
}
} }