From 66cc466648f50988c4572abd68e22889931dae3f Mon Sep 17 00:00:00 2001 From: Alpha Date: Thu, 18 Jan 2024 23:27:03 +0900 Subject: [PATCH] Fix build (#81) * Fix build, again * real fix --- .../alwaysuptodate/tasks/PurpurUpdateTask.kt | 12 ++++++++++++ gradle/libs.versions.toml | 2 +- patches/api/0003-Build-system-changes.patch | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) 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 444a6dc..23e91fb 100644 --- a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt +++ b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/PurpurUpdateTask.kt @@ -107,6 +107,7 @@ abstract class PurpurUpdateTask : Task() { copySource(paper) Git(paper)("add", ".").executeOut() Git(paper)("commit", "-m", "Vanilla Sources", "--author=Vanilla ").executeOut() + Thread.sleep(1_000) paper.resolve(".git").toFile().copyRecursively(dotGit, overwrite = true) Git(it).addCommit("Pufferfish Server Changes\n\n$pufferfishCommit", "--author=Kevin Raneri ") @@ -154,4 +155,15 @@ abstract class PurpurUpdateTask : Task() { } } + abstract class PurpurBuildTask : Task() { + + private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension + + @TaskAction + fun build() { + + } + + } + } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02be563..28a12dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ shadow = "8.1.1" paperweight = "1.5.10" paperclip = "3.0.3" decompiler = "2.0.627.2" -remapper = "0.3.0:fat" +remapper = "0.10.0" [libraries] remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" } diff --git a/patches/api/0003-Build-system-changes.patch b/patches/api/0003-Build-system-changes.patch index 49663de..24a7893 100644 --- a/patches/api/0003-Build-system-changes.patch +++ b/patches/api/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 41d7b75e904b94073dfcd12b776a7759a963b66f..96974f191c13424d72839d85dfa2a6c29b9f4d1d 100644 +index 41d7b75e904b94073dfcd12b776a7759a963b66f..c37b8a63b050dcc2ad2b33955017df48120c4393 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,11 +9,13 @@ java { @@ -108,7 +108,7 @@ index 41d7b75e904b94073dfcd12b776a7759a963b66f..96974f191c13424d72839d85dfa2a6c2 + "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/", // Paper end - "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper -+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.provider.orNull?.version}", // Paper ++ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/${common.maven.transport.orNull?.version}", // Paper + // Plazma end ) options.tags("apiNote:a:API Note:")