This commit is contained in:
creeper123123321 2023-03-14 16:52:50 -03:00
parent c0dce2e425
commit a3cf49e786
2 changed files with 14 additions and 14 deletions

View File

@ -25,16 +25,14 @@ logger.lifecycle("Building ViaFabric: $version")
def getBranch() { def getBranch() {
def ENV = System.getenv() def ENV = System.getenv()
def branch = "unknown"
if (ENV.GITHUB_REF) { if (ENV.GITHUB_REF) {
def branch = ENV.GITHUB_REF branch = ENV.GITHUB_REF
return branch.substring(branch.lastIndexOf("/") + 1) } else if (grgit != null) {
branch = grgit.branch.current().name
} }
if (grgit == null) {
return "unknown"
}
def branch = grgit.branch.current().name
return branch.substring(branch.lastIndexOf("/") + 1) return branch.substring(branch.lastIndexOf("/") + 1)
} }
@ -87,7 +85,7 @@ allprojects {
subprojects { subprojects {
dependencies { dependencies {
implementation (rootProject) { implementation(rootProject) {
exclude group: "net.fabricmc", module: "fabric-loader" // prevent duplicate fabric-loader on run exclude group: "net.fabricmc", module: "fabric-loader" // prevent duplicate fabric-loader on run
} }
} }
@ -161,8 +159,9 @@ processResources {
} }
} }
List<String> mcReleases = new ArrayList<>( List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(","))
Arrays.asList("1.18.2", "1.17.1", "1.16.5", "1.15.2", "1.14.4", "1.8.9")) .map({ it -> it.trim() })
.collect(Collectors.toList())
List<String> javaVersions = IntStream.rangeClosed(8, 18) List<String> javaVersions = IntStream.rangeClosed(8, 18)
.mapToObj { n -> (String) "Java $n" } .mapToObj { n -> (String) "Java $n" }
.collect(Collectors.toList()) .collect(Collectors.toList())
@ -214,7 +213,7 @@ modrinth {
uploadFile.set(remapJar) uploadFile.set(remapJar)
List<String> mcs = new ArrayList<>(mcReleases) List<String> mcs = new ArrayList<>(mcReleases)
if (!rootProject.modrinth_mc_snapshot.isEmpty()) mcs.add(rootProject.modrinth_mc_snapshot) if (!rootProject.modrinth_mc_snapshot.isEmpty()) mcs.add(rootProject.modrinth_mc_snapshot.toString())
gameVersions.set(mcs) gameVersions.set(mcs)
loaders.set(["fabric"]) loaders.set(["fabric"])

View File

@ -3,10 +3,11 @@
org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication
loader_version=0.14.14 loader_version=0.14.14
viaver_version=4.6.0-1.19.4-rc2-SNAPSHOT viaver_version=4.6.0
yaml_version=1.33 yaml_version=1.33
publish_mc_versions=1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9
# example: 1.19.1-rc2 # example: 1.19.1-rc2
modrinth_mc_snapshot=1.19.4-rc2 modrinth_mc_snapshot=
# example: 1.19-Snapshot # example: 1.19-Snapshot
curseforge_mc_snapshot=1.19-Snapshot curseforge_mc_snapshot=