Johannes
/
Scripts
1
0
Fork 0
Code Issues Packages Projects Releases Activity

Try to move problematic properties under ext

This commit is contained in:
Johannes Frohnmeyer 2021-11-29 18:41:28 +00:00
parent 67893c238a
commit 1405ea69fb
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
jfmod.gradle
View File

@ -103,18 +103,22 @@ if (!project.hasProperty("release")) {
}
println(changelogStr)
if (!project.hasProperty("modrinth_required_dependencies")) {
project.setProperty("modrinth_required_dependencies", "")
}
if (!project.hasProperty("modrinth_optional_dependencies")) {
project.setProperty("modrinth_optional_dependencies", "")
}
if (!project.hasProperty("curseforge_required_dependencies")) {
project.setProperty("curseforge_required_dependencies", "")
}
if (!project.hasProperty("curseforge_optional_dependencies")) {
project.setProperty("curseforge_optional_dependencies", "")
}
if (!project.hasProperty("modrinth_required_dependencies"))
project.ext.modrinth_required_dependencies = ""
else
project.ext.modrinth_required_dependencies = project.modrinth_required_dependencies
if (!project.hasProperty("modrinth_optional_dependencies"))
project.ext.modrinth_optional_dependencies = ""
else
project.ext.modrinth_optional_dependencies = project.modrinth_optional_dependencies
if (!project.hasProperty("curseforge_required_dependencies"))
project.ext.curseforge_required_dependencies = ""
else
project.ext.curseforge_required_dependencies = project.curseforge_required_dependencies
if (!project.hasProperty("curseforge_optional_dependencies"))
project.ext.curseforge_optional_dependencies = ""
else
project.ext.curseforge_optional_dependencies = project.curseforge_optional_dependencies
allprojects {
apply plugin: "java-library"
@ -301,13 +305,13 @@ task modrinth(type: com.modrinth.minotaur.TaskModrinthUpload, dependsOn: build)
uploadFile = file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")
addGameVersion("${project.minecraft_version}")
addLoader('fabric')
if (!project.modrinth_required_dependencies.isEmpty()) {
project.modrinth_required_dependencies.split(", ").each {
if (!project.ext.modrinth_required_dependencies.isEmpty()) {
project.ext.modrinth_required_dependencies.split(", ").each {
String dep -> addDependency(dep, com.modrinth.minotaur.request.Dependency.DependencyType.REQUIRED)
}
}
if (!project.modrinth_optional_dependencies.isEmpty()) {
project.modrinth_optional_dependencies.split(", ").each {
if (!project.ext.modrinth_optional_dependencies.isEmpty()) {
project.ext.modrinth_optional_dependencies.split(", ").each {
String dep -> addDependency(dep, com.modrinth.minotaur.request.Dependency.DependencyType.OPTIONAL)
}
}
@ -327,15 +331,15 @@ curseforge {
changelog = changelogStr
mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
mainArtifact.displayName = "[${project.minecraft_version}] ${version}"
if (!project.curseforge_required_dependencies.isEmpty() || !project.curseforge_optional_dependencies.isEmpty()) {
if (!project.ext.curseforge_required_dependencies.isEmpty() || !project.ext.curseforge_optional_dependencies.isEmpty()) {
relations {
if (!project.curseforge_required_dependencies.isEmpty()) {
project.curseforge_required_dependencies.split(", ").each {
if (!project.ext.curseforge_required_dependencies.isEmpty()) {
project.ext.curseforge_required_dependencies.split(", ").each {
String dep -> requiredDependency dep
}
}
if (!project.curseforge_optional_dependencies.isEmpty()) {
project.curseforge_optional_dependencies.split(", ").each {
if (!project.ext.curseforge_optional_dependencies.isEmpty()) {
project.ext.curseforge_optional_dependencies.split(", ").each {
String dep -> optionalDependency dep
}
}