Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use local offset when compiling locally

Browse Source
This commit is contained in:
NotMyFault 2021-04-18 20:23:32 +02:00
parent b59d0e9843
commit fe1cb649c8
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
2 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build.gradle.kts
View File

@ -15,42 +15,26 @@ logger.lifecycle("""
******************************************* *******************************************
""") """)
//TODO FIX THIS WHEN I FEEL LIKE IT
var rootVersion by extra("1.16") var rootVersion by extra("1.16")
var revision: String by extra("") var revision: String by extra("")
var buildNumber by extra("") var buildNumber by extra("")
var date: String by extra("") var date: String by extra("")
ext { ext {
val git: Grgit = Grgit.open { val git: Grgit = Grgit.open {
dir = File("$rootDir/.git"); dir = File("$rootDir/.git")
} }
date = git.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd")); date = git.head().dateTime.format(DateTimeFormatter.ofPattern("yy.MM.dd"))
revision = "-${git.head().abbreviatedId}"; revision = "-${git.head().abbreviatedId}"
var parents: MutableList<String>? = git.head().parentIds; val commit: String? = Grgit.open().head().abbreviatedId
if (project.hasProperty("buildnumber")) { buildNumber = if (project.hasProperty("buildnumber")) {
buildNumber = project.properties["buildnumber"] as String; project.properties["buildnumber"] as String
} else { } else {
var index = -2109; // Offset to match CI commit.toString()
while (parents != null && parents.isNotEmpty()) {
parents = git.resolve.toCommit(parents[0]).parentIds
index++;
}
buildNumber = index.toString();
}
}
allprojects {
gradle.projectsEvaluated {
tasks.withType(JavaCompile::class) {
options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
}
} }
} }
version = String.format("%s-%s", rootVersion, buildNumber) version = String.format("%s-%s", rootVersion, buildNumber)
applyCommonConfiguration()
if (!project.hasProperty("gitCommitHash")) { if (!project.hasProperty("gitCommitHash")) {
apply(plugin = "org.ajoberstar.grgit") apply(plugin = "org.ajoberstar.grgit")
ext["gitCommitHash"] = try { ext["gitCommitHash"] = try {
@ -61,3 +45,13 @@ if (!project.hasProperty("gitCommitHash")) {
"no.git.id" "no.git.id"
} }
} }
allprojects {
gradle.projectsEvaluated {
tasks.withType(JavaCompile::class) {
options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
}
}
}
applyCommonConfiguration()

1
gradle.properties
View File

@ -1,5 +1,4 @@
group=com.sk89q.worldedit group=com.sk89q.worldedit
version=7.2.0-SNAPSHOT
org.gradle.jvmargs=-Xmx1512M org.gradle.jvmargs=-Xmx1512M
org.gradle.daemon=true org.gradle.daemon=true