build: remove commented-out uses of reflections-cache

develop
Kevin Turner 2021-04-27 14:04:18 -07:00
parent 2b54db578a
commit 0bd23a74f5
3 changed files with 1 additions and 19 deletions

View File

@ -9,7 +9,6 @@ import org.terasology.gradology.ModuleMetadataForGradle
plugins {
`java-library`
// id("reflections-manifest")
idea
eclipse
}
@ -133,14 +132,9 @@ tasks.register<Sync>("syncDeltas") {
into("${mainSourceSet.output.classesDirs.first()}/deltas")
}
//tasks.named("compileJava") {
// finalizedBy("cacheReflections")
//}
// Instructions for packaging a jar file - is a manifest even needed for modules?
tasks.named("jar") {
// Make sure the assets directory is included
// dependsOn("cacheReflections")
dependsOn("syncAssets")
dependsOn("syncOverrides")
dependsOn("syncDeltas")

View File

@ -6,7 +6,6 @@
plugins {
id "java-library"
id "org.jetbrains.gradle.plugin.idea-ext"
// id("reflections-manifest")
}
// Grab all the common stuff like plugins to use, artifact repositories, code analysis config, etc
@ -107,7 +106,7 @@ dependencies {
api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.1.0-SNAPSHOT'
api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.1.0-SNAPSHOT'
api group: 'org.terasology.gestalt', name: 'gestalt-util', version: '7.1.0-SNAPSHOT'
api "com.github.zafarkhaja:java-semver:0.10.0"
api "com.github.zafarkhaja:java-semver:0.10.0" // ASAP: Remove after https://github.com/MovingBlocks/gestalt/pull/110
api group: 'org.terasology', name: 'TeraMath', version: '1.5.0'
api group: 'org.terasology', name: 'splash-screen', version: '1.1.1'
@ -135,8 +134,6 @@ jar {
// Unlike the content modules Gradle grabs the assets as they're in a resources directory. Need to avoid dupes tho
duplicatesStrategy = "EXCLUDE"
// dependsOn(tasks.named("cacheReflections"))
doFirst {
manifest {
def manifestClasspath = "$subDirLibs/" + configurations."${sourceSets.main.runtimeClasspathConfigurationName}".collect {

View File

@ -1,15 +1,10 @@
// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
//plugins {
// id("reflections-manifest").apply(false)
//}
subprojects {
// Hack for getting sourcesSets.main.output there.
plugins.apply('java')
plugins.apply('idea')
// plugins.apply("reflections-manifest")
def sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class).sourceSets
@ -24,8 +19,4 @@ subprojects {
downloadSources = true
}
}
// tasks.named("jar") {
// dependsOn('cacheReflections')
// }
}