diff --git a/build.gradle.kts b/build.gradle.kts index 5e68caa81e..40900c621c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -536,11 +536,16 @@ curseforge { embeddedLibrary("frozenlib") embeddedLibrary("nbt-crafting") }) - mainArtifact(file("build/libs/${tasks.remapJar.get().archiveBaseName.get()}-${version}.jar"), closureOf { + mainArtifact(remapJar, closureOf { displayName = display_name }) + addArtifact(tasks.remapSourcesJar) + addArtifact(javadocJar) + afterEvaluate { uploadTask.dependsOn(remapJar) + uploadTask.dependsOn(tasks.remapSourcesJar) + uploadTask.dependsOn(javadocJar) } }) curseGradleOptions.forgeGradleIntegration = false @@ -553,9 +558,10 @@ modrinth { versionName.set(display_name) versionType.set(release_type) changelog.set(changelog_text) - uploadFile.set(file("build/libs/${tasks.remapJar.get().archiveBaseName.get()}-${version}.jar")) + uploadFile.set(remapJar) gameVersions.set(listOf(minecraft_version)) loaders.set(listOf("fabric", "quilt")) + additionalFiles.set(listOf(tasks.remapSourcesJar.get(), javadocJar)) dependencies { required.project("fabric-api") optional.project("cloth-config") diff --git a/settings.gradle.kts b/settings.gradle.kts index 552f66446f..ff72759d84 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,18 +29,18 @@ rootProject.name = "Wilder Wild" localRepository("FrozenLib", "maven.modrinth:frozenlib", true) -val allowLocalRepoUse = false -val allowLocalRepoInConsoleMode = true -val androidInjectedInvokedFromIde by extra("android.injected.invoked.from.ide") -val xpcServiceName by extra("XPC_SERVICE_NAME") -val ideaInitialDirectory by extra("IDEA_INITIAL_DIRECTORY") +fun localRepository(repo: String, dependencySub: String, kotlin: Boolean) { + println("Attempting to include local repo $repo") -val isIDE = androidInjectedInvokedFromIde != "" || (System.getenv(xpcServiceName) ?: "").contains("intellij") || (System.getenv(xpcServiceName) ?: "").contains(".idea") || System.getenv(ideaInitialDirectory) != null + val allowLocalRepoUse = true + val allowLocalRepoInConsoleMode = true + val androidInjectedInvokedFromIde by extra("android.injected.invoked.from.ide") + val xpcServiceName by extra("XPC_SERVICE_NAME") + val ideaInitialDirectory by extra("IDEA_INITIAL_DIRECTORY") -fun localRepository(repo: String, dependencySub: String, kotlin: Boolean) { - println("Attempting to include local repo $repo") + val isIDE = androidInjectedInvokedFromIde != "" || (System.getenv(xpcServiceName) ?: "").contains("intellij") || (System.getenv(xpcServiceName) ?: "").contains(".idea") || System.getenv(ideaInitialDirectory) != null val github = System.getenv("GITHUB_ACTIONS") == "true"