mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-11 19:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use logger in Gradle over println (#434)

Browse Source 
* Log info instead of println in gradle scripts

* Missed buildSrc printlns
This commit is contained in:
Astrashh
2023-11-25 00:59:25 +00:00
committed by GitHub
parent 09ee0eccba
commit 3527eafbca
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/AddonConfig.kt
+2 -2
View File
@@ -18,7 +18,7 @@ fun Project.addonDir(dir: File, task: Task) {
matchingAddons(dir) { matchingAddons(dir) {
it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon. it.name.startsWith("Terra-") // Assume everything that starts with Terra- is a core addon.
}.forEach { }.forEach {
println("Deleting old addon: " + it.absolutePath) logger.info("Deleting old addon: " + it.absolutePath)
it.delete() it.delete()
} }
forSubProjects(":common:addons") { forSubProjects(":common:addons") {
@@ -29,7 +29,7 @@ fun Project.addonDir(dir: File, task: Task) {
val base = "${jar.archiveBaseName.get()}-${version}" val base = "${jar.archiveBaseName.get()}-${version}"
println("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base") logger.info("Copying addon ${jar.archiveFileName.get()} to ${target.absolutePath}. Base name: $base")
jar.archiveFile.orNull?.asFile?.copyTo(target) jar.archiveFile.orNull?.asFile?.copyTo(target)
} }
buildSrc/src/main/kotlin/DistributionConfig.kt
+1 -1
View File
@@ -53,7 +53,7 @@ fun Project.configureDistribution() {
forSubProjects(":common:addons") { forSubProjects(":common:addons") {
val jar = getJarTask() val jar = getJarTask()
println("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB") logger.info("Packaging addon ${jar.archiveFileName.get()} to $dest. size: ${jar.archiveFile.get().asFile.length() / 1024}KB")
val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else "" val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else ""
val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}") val addonPath = fs.getPath("/addons/$boot${jar.archiveFileName.get()}")
buildSrc/src/main/kotlin/Utils.kt
+2 -2
View File
@@ -42,10 +42,10 @@ fun preRelease(preRelease: Boolean) {
fun Project.versionProjects(project: String, version: String) { fun Project.versionProjects(project: String, version: String) {
forSubProjects(project) { forSubProjects(project) {
this.version = version this.version = version
println("Setting version of $path to $version") logger.info("Setting version of $path to $version")
} }
project(project).version = version project(project).version = version
println("Setting version of $project to $version") logger.info("Setting version of $project to $version")
} }
fun Project.version(version: String): String { fun Project.version(version: String): String {
buildSrc/src/main/kotlin/com/dfsek/terra/tectonicdoc/GenerateDocsTask.kt
+1 -1
View File
@@ -82,7 +82,7 @@ abstract class GenerateDocsTask : DefaultTask() {
} }
template.add(keyName.toString(), description.toString().ifBlank { template.add(keyName.toString(), description.toString().ifBlank {
println("No description provided for field " + field.name + " in class " + name) logger.info("No description provided for field " + field.name + " in class " + name)
"*No description provided.*" "*No description provided.*"
}) })
} }
platforms/merged/build.gradle.kts
+2 -2
View File
@@ -13,7 +13,7 @@ val dump = tasks.create("dumpDependents") {
doFirst { doFirst {
taskSet.forEach { taskSet.forEach {
val resource = File(resourcesDir, it.archiveFileName.get()) val resource = File(resourcesDir, it.archiveFileName.get())
println("Including archive " + it.archiveFileName.orNull + " in directory " + resource.absolutePath) logger.info("Including archive " + it.archiveFileName.orNull + " in directory " + resource.absolutePath)
it.archiveFile.get().asFile.copyTo(resource, true) it.archiveFile.get().asFile.copyTo(resource, true)
} }
} }
@@ -32,6 +32,6 @@ afterEvaluate {
} }
tasks["dumpDependents"].dependsOn(task) tasks["dumpDependents"].dependsOn(task)
taskSet.add(task) taskSet.add(task)
println("Merged JAR will incorporate task ${task.name} from platform ${it.name}.") logger.info("Merged JAR will incorporate task ${task.name} from platform ${it.name}.")
} }
} }
settings.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ fun includeImmediateChildren(dir: File, type: String) {
dir.walkTopDown().maxDepth(1).forEach { dir.walkTopDown().maxDepth(1).forEach {
if (!it.isDirectory || !File(it, "build.gradle.kts").exists()) return@forEach if (!it.isDirectory || !File(it, "build.gradle.kts").exists()) return@forEach
val addonDir = it.relativeTo(file(".")).path.replace("/", ":").replace("\\", ":") val addonDir = it.relativeTo(file(".")).path.replace("/", ":").replace("\\", ":")
println("Including $type directory \"$addonDir\" as subproject.") logger.info("Including $type directory \"$addonDir\" as subproject.")
include(addonDir) include(addonDir)
} }
} }