From e74e8e2fe612ef6511ca454dffe21e910505425e Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 14 Jun 2024 10:56:34 +0900 Subject: [PATCH] Try publishing regular jars to maven (not full fat jars) for Forge and NeoForge --- Fabric/build.gradle.kts | 2 ++ Forge/build.gradle.kts | 45 ++++++++++----------------------------- NeoForge/build.gradle.kts | 44 ++++++++++---------------------------- 3 files changed, 24 insertions(+), 67 deletions(-) diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts index 093ea637c..806f68e1d 100644 --- a/Fabric/build.gradle.kts +++ b/Fabric/build.gradle.kts @@ -246,6 +246,8 @@ publishing { idea { module { + isDownloadJavadoc = true + isDownloadSources = true for (fileName in listOf("run", "out", "logs")) { excludeDirs.add(file(fileName)) } diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts index 882bfb618..e51bc79e2 100644 --- a/Forge/build.gradle.kts +++ b/Forge/build.gradle.kts @@ -142,40 +142,20 @@ minecraft { } } -tasks.withType().configureEach { - dependencyProjects.forEach { - source(it.sourceSets.main.get().allSource) - } -} - -tasks.processResources { - dependencyProjects.forEach { - from(it.sourceSets.main.get().resources) - } -} - -tasks.jar { - from(sourceSets.main.get().output) - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -val sourcesJarTask = tasks.named("sourcesJar") { - from(sourceSets.main.get().allJava) - for (p in dependencyProjects) { - from(p.sourceSets.main.get().allJava) +val sourcesJarTask = tasks.named("sourcesJar") +val fatJarTask = tasks.create("fatJar") { + dependencyProjects.forEach { + from(it.sourceSets.main.get().output) } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveClassifier.set("sources") } tasks.register("publishCurseForge") { - dependsOn(tasks.jar) + dependsOn(fatJarTask) dependsOn(":Changelog:makeChangelog") apiToken = project.findProperty("curseforge_apikey") ?: "0" - val mainFile = upload(curseProjectId, tasks.jar.get().archiveFile) + val mainFile = upload(curseProjectId, fatJarTask.archiveFile) mainFile.changelogType = CFG_Constants.CHANGELOG_HTML mainFile.changelog = file("../Changelog/changelog.html") mainFile.releaseType = CFG_Constants.RELEASE_TYPE_BETA @@ -194,10 +174,10 @@ modrinth { versionNumber.set("${project.version}") versionName.set("${project.version} for Forge $minecraftVersion") versionType.set("beta") - uploadFile.set(tasks.jar.get()) + uploadFile.set(fatJarTask) changelog.set(provider { file("../Changelog/changelog.md").readText() }) } -tasks.modrinth.get().dependsOn(tasks.jar) +tasks.modrinth.get().dependsOn(fatJarTask) tasks.modrinth.get().dependsOn(":Changelog:makeMarkdownChangelog") tasks.named("test") { @@ -214,6 +194,7 @@ tasks.named("test") { artifacts { archives(tasks.jar.get()) archives(sourcesJarTask.get()) + archives(fatJarTask) } publishing { @@ -244,14 +225,10 @@ publishing { idea { module { + isDownloadJavadoc = true + isDownloadSources = true for (fileName in listOf("run", "out", "logs")) { excludeDirs.add(file(fileName)) } } } -// Required because FG, copied from the MDK -sourceSets.forEach { - val outputDir = layout.buildDirectory.file("sourcesSets/${it.name}").get().asFile - it.output.setResourcesDir(outputDir) - it.java.destinationDirectory.set(outputDir) -} diff --git a/NeoForge/build.gradle.kts b/NeoForge/build.gradle.kts index 7b104534d..dc27505a3 100644 --- a/NeoForge/build.gradle.kts +++ b/NeoForge/build.gradle.kts @@ -55,20 +55,6 @@ dependencyProjects.forEach { } project.evaluationDependsOn(":Changelog") -val notNeoTask = { it: Task -> !it.name.startsWith("neo") } - -tasks.withType().matching(notNeoTask).configureEach { - dependencyProjects.forEach { - source(it.sourceSets.main.get().allSource) - } -} - -tasks.withType().matching(notNeoTask).configureEach { - dependencyProjects.forEach { - from(it.sourceSets.main.get().resources) - } -} - java { toolchain { languageVersion.set(JavaLanguageVersion.of(modJavaVersion)) @@ -134,31 +120,20 @@ runs { } } -tasks.jar { - from(sourceSets.main.get().output) - for (p in dependencyProjects) { - from(p.sourceSets.main.get().output) - } - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -val sourcesJarTask = tasks.named("sourcesJar") { - from(sourceSets.main.get().allJava) - for (p in dependencyProjects) { - from(p.sourceSets.main.get().allJava) +val sourcesJarTask = tasks.named("sourcesJar") +val fatJarTask = tasks.create("fatJar") { + dependencyProjects.forEach { + from(it.sourceSets.main.get().output) } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - archiveClassifier.set("sources") } tasks.register("publishCurseForge") { - dependsOn(tasks.jar) + dependsOn(fatJarTask) dependsOn(":Changelog:makeChangelog") apiToken = project.findProperty("curseforge_apikey") ?: "0" - val mainFile = upload(curseProjectId, tasks.jar.get().archiveFile) + val mainFile = upload(curseProjectId, fatJarTask.archiveFile) mainFile.changelogType = CFG_Constants.CHANGELOG_HTML mainFile.changelog = file("../Changelog/changelog.html") mainFile.releaseType = CFG_Constants.RELEASE_TYPE_BETA @@ -177,10 +152,10 @@ modrinth { versionNumber.set("${project.version}") versionName.set("${project.version} for NeoForge $minecraftVersion") versionType.set("beta") - uploadFile.set(tasks.jar.get()) + uploadFile.set(fatJarTask) changelog.set(provider { file("../Changelog/changelog.md").readText() }) } -tasks.modrinth.get().dependsOn(tasks.jar) +tasks.modrinth.get().dependsOn(fatJarTask) tasks.modrinth.get().dependsOn(":Changelog:makeMarkdownChangelog") tasks.named("test") { @@ -197,6 +172,7 @@ tasks.named("test") { artifacts { archives(tasks.jar.get()) archives(sourcesJarTask.get()) + archives(fatJarTask) } publishing { @@ -227,6 +203,8 @@ publishing { idea { module { + isDownloadJavadoc = true + isDownloadSources = true for (fileName in listOf("run", "out", "logs")) { excludeDirs.add(file(fileName)) }