diff --git a/.gitignore b/.gitignore index 14a5b5f..65d08f7 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ build-data/ *-MojangAPI *-Server paper-api-generator +compare.txt diff --git a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt index 6741e96..149f95b 100644 --- a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt +++ b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/AlwaysUpToDate.kt @@ -2,7 +2,10 @@ package org.plazmamc.alwaysuptodate import org.gradle.api.Plugin import org.gradle.api.Project -import org.plazmamc.alwaysuptodate.tasks.* +import org.plazmamc.alwaysuptodate.tasks.CheckPaperCommitTask +import org.plazmamc.alwaysuptodate.tasks.CheckPurpurCommitTask +import org.plazmamc.alwaysuptodate.tasks.PaperUpdateTask +import org.plazmamc.alwaysuptodate.tasks.PurpurUpdateTask class AlwaysUpToDate : Plugin { diff --git a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PaperUpdateTask.kt b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PaperUpdateTask.kt index 9b1d941..b48d3fc 100644 --- a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PaperUpdateTask.kt +++ b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PaperUpdateTask.kt @@ -5,7 +5,6 @@ import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.get import org.plazmamc.alwaysuptodate.AlwaysUpToDateException import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension -import org.plazmamc.alwaysuptodate.utils.pathIO import java.io.File abstract class PaperUpdateTask : Task() { @@ -13,13 +12,24 @@ abstract class PaperUpdateTask : Task() { private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension override fun init() { - outputs.upToDateWhen { project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "purpurCommit") } + outputs.upToDateWhen { + project.checkCommit( + property.paperRepository.get(), + property.paperBranch.get(), + "purpurCommit" + ) + } } @TaskAction fun update() { if (project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "purpurCommit")) return - project.createCompareComment(property.paperRepository.get(), property.paperBranch.get(), project.properties["paperCommit"] as String) + project.createCompareComment( + property.paperRepository.get(), + property.paperBranch.get(), + project.properties["paperCommit"] as String, + true + ) updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), project.file("gradle.properties")) } diff --git a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt index 2dba931..99a6641 100644 --- a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt +++ b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt @@ -1,6 +1,8 @@ package org.plazmamc.alwaysuptodate.tasks -import io.papermc.paperweight.util.* +import io.papermc.paperweight.util.Git +import io.papermc.paperweight.util.cache +import io.papermc.paperweight.util.path import org.gradle.api.tasks.TaskAction import org.gradle.kotlin.dsl.get import org.plazmamc.alwaysuptodate.AlwaysUpToDateException @@ -8,7 +10,6 @@ import org.plazmamc.alwaysuptodate.AlwaysUpToDateExtension import org.plazmamc.alwaysuptodate.utils.Gradle import org.plazmamc.alwaysuptodate.utils.addCommit import org.plazmamc.alwaysuptodate.utils.clone -import org.plazmamc.alwaysuptodate.utils.pathIO import java.nio.file.Path import kotlin.io.path.createDirectories import kotlin.io.path.exists @@ -57,7 +58,13 @@ abstract class PurpurUpdateTask : Task() { """.trimIndent() override fun init() { - outputs.upToDateWhen { project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit") } + outputs.upToDateWhen { + project.checkCommit( + property.purpurRepository.get(), + property.purpurBranch.get(), + "purpurCommit" + ) + } } @TaskAction @@ -65,7 +72,12 @@ abstract class PurpurUpdateTask : Task() { if (project.checkCommit(property.purpurRepository.get(), property.purpurBranch.get(), "purpurCommit")) return Git.checkForGit() - project.createCompareComment(property.purpurRepository.get(), property.purpurBranch.get(), project.properties["paperCommit"] as String) + project.createCompareComment( + property.purpurRepository.get(), + property.purpurBranch.get(), + project.properties["paperCommit"] as String, + true + ) val dir = project.layout.cache.resolve("AlwaysUpToDate/UpdatePurpur") if (dir.exists()) dir.toFile().deleteRecursively() @@ -79,7 +91,11 @@ abstract class PurpurUpdateTask : Task() { updatePaperCommit(property.paperRepository.get(), property.paperBranch.get(), purpur.resolve("gradle.properties").toFile()) if (!project.checkCommit(property.paperRepository.get(), property.paperBranch.get(), "paperCommit")) { - project.createCompareComment(property.paperRepository.get(), property.paperBranch.get(), project.properties["paperCommit"] as String) + project.createCompareComment( + property.paperRepository.get(), + property.paperBranch.get(), + project.properties["paperCommit"] as String + ) updatePaperCommit( property.paperRepository.get(), property.paperBranch.get(),