Compare commits
1 Commits
dev/1.21.5
...
build/1.20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66cc466648 |
@@ -107,6 +107,7 @@ abstract class PurpurUpdateTask : Task() {
|
|||||||
copySource(paper)
|
copySource(paper)
|
||||||
Git(paper)("add", ".").executeOut()
|
Git(paper)("add", ".").executeOut()
|
||||||
Git(paper)("commit", "-m", "Vanilla Sources", "--author=Vanilla <auto@mated.null>").executeOut()
|
Git(paper)("commit", "-m", "Vanilla Sources", "--author=Vanilla <auto@mated.null>").executeOut()
|
||||||
|
Thread.sleep(1_000)
|
||||||
paper.resolve(".git").toFile().copyRecursively(dotGit, overwrite = true)
|
paper.resolve(".git").toFile().copyRecursively(dotGit, overwrite = true)
|
||||||
|
|
||||||
Git(it).addCommit("Pufferfish Server Changes\n\n$pufferfishCommit", "--author=Kevin Raneri <kevin.raneri@gmail.com>")
|
Git(it).addCommit("Pufferfish Server Changes\n\n$pufferfishCommit", "--author=Kevin Raneri <kevin.raneri@gmail.com>")
|
||||||
@@ -154,4 +155,15 @@ abstract class PurpurUpdateTask : Task() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class PurpurBuildTask : Task() {
|
||||||
|
|
||||||
|
private val property = project.extensions["alwaysUpToDate"] as AlwaysUpToDateExtension
|
||||||
|
|
||||||
|
@TaskAction
|
||||||
|
fun build() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ shadow = "8.1.1"
|
|||||||
paperweight = "1.5.10"
|
paperweight = "1.5.10"
|
||||||
paperclip = "3.0.3"
|
paperclip = "3.0.3"
|
||||||
decompiler = "2.0.627.2"
|
decompiler = "2.0.627.2"
|
||||||
remapper = "0.3.0:fat"
|
remapper = "0.10.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" }
|
remapper = { group = "net.fabricmc", name = "tiny-remapper", version.ref="remapper" }
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index 41d7b75e904b94073dfcd12b776a7759a963b66f..96974f191c13424d72839d85dfa2a6c29b9f4d1d 100644
|
index 41d7b75e904b94073dfcd12b776a7759a963b66f..c37b8a63b050dcc2ad2b33955017df48120c4393 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -9,11 +9,13 @@ java {
|
@@ -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}/",
|
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/${common.log4j.api.orNull?.version}/",
|
||||||
// Paper end
|
// 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/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
|
+ // Plazma end
|
||||||
)
|
)
|
||||||
options.tags("apiNote:a:API Note:")
|
options.tags("apiNote:a:API Note:")
|
||||||
|
|||||||
Reference in New Issue
Block a user