diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 767f5a084..5482c982a 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -95,13 +95,21 @@ publishing { artifact(tasks.jar) artifact(tasks.named("sourcesJar")) + val dependencyInfos = dependencyProjects.map { + mapOf( + "groupId" to it.group, + "artifactId" to it.base.archivesName.get(), + "version" to it.version + ) + } + pom.withXml { val dependenciesNode = asNode().appendNode("dependencies") - dependencyProjects.forEach { + dependencyInfos.forEach { val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.group) - dependencyNode.appendNode("artifactId", it.base.archivesName.get()) - dependencyNode.appendNode("version", it.version) + it.forEach { (key, value) -> + dependencyNode.appendNode(key, value) + } } } } diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts index 3148e337f..5f3debfc8 100644 --- a/Fabric/build.gradle.kts +++ b/Fabric/build.gradle.kts @@ -28,12 +28,13 @@ val curseHomepageUrl: String by extra val curseProjectId: String by extra val fabricApiVersion: String by extra val fabricLoaderVersion: String by extra +val minecraftExtraCompatibleVersion: String by extra val minecraftVersion: String by extra val modGroup: String by extra val modId: String by extra val modJavaVersion: String by extra -val parchmentVersionFabric: String by extra val parchmentMinecraftVersion: String by extra +val parchmentVersionFabric: String by extra // set by ORG_GRADLE_PROJECT_modrinthToken in Jenkinsfile val modrinthToken: String? by project @@ -199,6 +200,8 @@ tasks.register("publishCurseForge") { dependsOn(tasks.remapJar) dependsOn(":Changelog:makeChangelog") + disableVersionDetection() + apiToken = project.findProperty("curseforge_apikey") ?: "0" val mainFile = upload(curseProjectId, tasks.remapJar.get().archiveFile) @@ -207,6 +210,7 @@ tasks.register("publishCurseForge") { mainFile.releaseType = CFG_Constants.RELEASE_TYPE_BETA mainFile.addJavaVersion("Java $modJavaVersion") mainFile.addGameVersion(minecraftVersion) + mainFile.addGameVersion(minecraftExtraCompatibleVersion) mainFile.addModLoader("Fabric") doLast { @@ -253,13 +257,21 @@ publishing { artifact(tasks.remapJar) artifact(tasks.remapSourcesJar) + val dependencyInfos = dependencyProjects.map { + mapOf( + "groupId" to it.group, + "artifactId" to it.dependencyProject.base.archivesName.get(), + "version" to it.version + ) + } + pom.withXml { val dependenciesNode = asNode().appendNode("dependencies") - dependencyProjects.forEach { + dependencyInfos.forEach { val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.group) - dependencyNode.appendNode("artifactId", it.dependencyProject.base.archivesName.get()) - dependencyNode.appendNode("version", it.version) + it.forEach { (key, value) -> + dependencyNode.appendNode(key, value) + } } } } diff --git a/FabricApi/build.gradle.kts b/FabricApi/build.gradle.kts index a81402a2b..75766b8e5 100644 --- a/FabricApi/build.gradle.kts +++ b/FabricApi/build.gradle.kts @@ -116,13 +116,21 @@ publishing { artifact(tasks.remapJar) artifact(tasks.remapSourcesJar) + val dependencyInfos = dependencyProjects.map { + mapOf( + "groupId" to it.group, + "artifactId" to it.base.archivesName.get(), + "version" to it.version + ) + } + pom.withXml { val dependenciesNode = asNode().appendNode("dependencies") - dependencyProjects.forEach { + dependencyInfos.forEach { val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.group) - dependencyNode.appendNode("artifactId", it.base.archivesName.get()) - dependencyNode.appendNode("version", it.version) + it.forEach { (key, value) -> + dependencyNode.appendNode(key, value) + } } } } diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts index 0958cfcb2..c346a2837 100644 --- a/Forge/build.gradle.kts +++ b/Forge/build.gradle.kts @@ -175,6 +175,8 @@ tasks.register("publishCurseForge") { dependsOn(tasks.jar) dependsOn(":Changelog:makeChangelog") + disableVersionDetection() + apiToken = project.findProperty("curseforge_apikey") ?: "0" val mainFile = upload(curseProjectId, tasks.jar.get().archiveFile) diff --git a/ForgeApi/build.gradle.kts b/ForgeApi/build.gradle.kts index b5835d746..6adbdca8f 100644 --- a/ForgeApi/build.gradle.kts +++ b/ForgeApi/build.gradle.kts @@ -104,13 +104,21 @@ publishing { artifact(tasks.jar) artifact(sourcesJar) + val dependencyInfos = dependencyProjects.map { + mapOf( + "groupId" to it.group, + "artifactId" to it.base.archivesName.get(), + "version" to it.version + ) + } + pom.withXml { val dependenciesNode = asNode().appendNode("dependencies") - dependencyProjects.forEach { + dependencyInfos.forEach { val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.group) - dependencyNode.appendNode("artifactId", it.base.archivesName.get()) - dependencyNode.appendNode("version", it.version) + it.forEach { (key, value) -> + dependencyNode.appendNode(key, value) + } } } } diff --git a/NeoForge/build.gradle.kts b/NeoForge/build.gradle.kts index 465effe1a..315cef29f 100644 --- a/NeoForge/build.gradle.kts +++ b/NeoForge/build.gradle.kts @@ -153,6 +153,8 @@ tasks.register("publishCurseForge") { dependsOn(tasks.jar) dependsOn(":Changelog:makeChangelog") + disableVersionDetection() + apiToken = project.findProperty("curseforge_apikey") ?: "0" val mainFile = upload(curseProjectId, tasks.jar.get().archiveFile) diff --git a/NeoForgeApi/build.gradle.kts b/NeoForgeApi/build.gradle.kts index 93c254f7b..448a151fc 100644 --- a/NeoForgeApi/build.gradle.kts +++ b/NeoForgeApi/build.gradle.kts @@ -72,13 +72,21 @@ publishing { artifact(tasks.jar) artifact(sourcesJar) + val dependencyInfos = dependencyProjects.map { + mapOf( + "groupId" to it.group, + "artifactId" to it.base.archivesName.get(), + "version" to it.version + ) + } + pom.withXml { val dependenciesNode = asNode().appendNode("dependencies") - dependencyProjects.forEach { + dependencyInfos.forEach { val dependencyNode = dependenciesNode.appendNode("dependency") - dependencyNode.appendNode("groupId", it.group) - dependencyNode.appendNode("artifactId", it.base.archivesName.get()) - dependencyNode.appendNode("version", it.version) + it.forEach { (key, value) -> + dependencyNode.appendNode(key, value) + } } } }