From 8bd8c310737dfe14de2328ae92114aa2515b4618 Mon Sep 17 00:00:00 2001 From: Asoji Date: Tue, 27 Feb 2024 08:19:19 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=80=20i=20fucked=20your=20father=20las?= =?UTF-8?q?t=20night?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit im tired okay --- build.gradle.kts | 248 +++++++++++++++++++------------------- gradle/libs.versions.toml | 3 - 2 files changed, 122 insertions(+), 129 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bd23a4ce..2145efaa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,24 +1,23 @@ -import org.jetbrains.dokka.DokkaVersion import org.jetbrains.dokka.base.DokkaBase -import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.base.DokkaBaseConfiguration +import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL buildscript { - dependencies { - classpath("org.jetbrains.dokka:dokka-base:1.9.10") - } + dependencies { + classpath("org.jetbrains.dokka:dokka-base:1.9.10") + } } plugins { - kotlin("jvm") version "1.9.0" - `maven-publish` - java + kotlin("jvm") version "1.9.0" + `maven-publish` + java - alias(libs.plugins.grgit) - alias(libs.plugins.fabric.loom) - alias(libs.plugins.dokka) + alias(libs.plugins.grgit) + alias(libs.plugins.fabric.loom) + alias(libs.plugins.dokka) } val archivesBaseName = "${project.property("archives_base_name").toString()}" @@ -26,167 +25,164 @@ version = getModVersion() group = project.property("maven_group")!! repositories { - maven { url = uri("https://maven.parchmentmc.org") } - maven { url = uri("https://mvn.devos.one/snapshots") } + maven { url = uri("https://maven.parchmentmc.org") } + maven { url = uri("https://mvn.devos.one/snapshots") } } //All dependencies and their versions are in ./gradle/libs.versions.toml dependencies { - minecraft(libs.minecraft) - - mappings(loom.layered { - officialMojangMappings() - parchment("org.parchmentmc.data:parchment-1.20.3:2023.12.31@zip") - }) + minecraft(libs.minecraft) - //Fabric - modImplementation(libs.fabric.loader) - modImplementation(libs.fabric.api) + mappings(loom.layered { + officialMojangMappings() + parchment("org.parchmentmc.data:parchment-1.20.3:2023.12.31@zip") + }) - include(modImplementation("gay.asoji:fmw:1.0.0+build.8")!!) + //Fabric + modImplementation(libs.fabric.loader) + modImplementation(libs.fabric.api) - dokkaPlugin(libs.dokka.versioning) + include(modImplementation("gay.asoji:fmw:1.0.0+build.8")!!) } tasks.withType().configureEach { - dokkaSourceSets { - named("main") { - moduleName.set("Inner Pastels") - moduleVersion.set(version.toString()) - - includes.from("Module.md") - - sourceLink { - localDirectory.set(file("src/main/kotlin")) - remoteUrl.set(URL("http://github.com/devOS-Sanity-Edition/InnerPastels/tree/main/" + "src/main/kotlin")) - remoteLineSuffix.set("#L") - } - } - } - pluginConfiguration { + dokkaSourceSets { + named("main") { + moduleName.set("Inner Pastels") + moduleVersion.set(project.version.toString()) + + includes.from("Module.md") + + sourceLink { + localDirectory.set(file("src/main/kotlin")) + remoteUrl.set(URL("http://github.com/devOS-Sanity-Edition/InnerPastels/tree/main/" + "src/main/kotlin")) + remoteLineSuffix.set("#L") + } + } + } + pluginConfiguration { // customAssets = listOf(file("my-image.png")) // customStyleSheets = listOf(file("my-styles.css")) - footerMessage = "(c) 2024 devOS: Sanity Edition, Team Nautical, asoji" - separateInheritedMembers = true + footerMessage = "(c) 2024 devOS: Sanity Edition, Team Nautical, asoji" + separateInheritedMembers = true // templatesDir = file("dokka/templates") - mergeImplicitExpectActualDeclarations = true - } + mergeImplicitExpectActualDeclarations = true + } } // Write the version to the fabric.mod.json tasks.processResources { - inputs.property("version", project.version) + inputs.property("version", project.version) - filesMatching("fabric.mod.json") { - expand(mutableMapOf("version" to project.version)) - } + filesMatching("fabric.mod.json") { + expand(mutableMapOf("version" to project.version)) + } } tasks.withType().configureEach { - options.release.set(17) + options.release.set(17) } java { - withSourcesJar() + withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}"} - } + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } } // This will attempt to publish the mod to the devOS Maven, otherwise it will build the mod locally // This is auto run by GitHub Actions task("buildOrPublish") { - group = "build" - var mavenUser = System.getenv().get("MAVEN_USER") - if (!mavenUser.isNullOrEmpty()) { - dependsOn(tasks.getByName("publish")) - println("prepared for publish") - } else { - dependsOn(tasks.getByName("build")) - println("prepared for build") - } + group = "build" + var mavenUser = System.getenv().get("MAVEN_USER") + if (!mavenUser.isNullOrEmpty()) { + dependsOn(tasks.getByName("publish")) + println("prepared for publish") + } else { + dependsOn(tasks.getByName("build")) + println("prepared for build") + } } -// TODO: Uncomment for a non template mod! publishing { - publications { - create("mavenJava") { - groupId = project.property("maven_group").toString() - artifactId = project.property("archives_base_name").toString() - version = getModVersion() - - from(components.get("java")) - } - } - - repositories { - maven { - url = uri("https://mvn.devos.one/${System.getenv()["PUBLISH_SUFFIX"]}/") - credentials { - username = System.getenv()["MAVEN_USER"] - password = System.getenv()["MAVEN_PASS"] - } - } - } + publications { + create("mavenJava") { + groupId = project.property("maven_group").toString() + artifactId = project.property("archives_base_name").toString() + version = getModVersion() + + from(components.get("java")) + } + } + + repositories { + maven { + url = uri("https://mvn.devos.one/${System.getenv()["PUBLISH_SUFFIX"]}/") + credentials { + username = System.getenv()["MAVEN_USER"] + password = System.getenv()["MAVEN_PASS"] + } + } + } } loom { - runs { - create("datagen") { - client() - name("Data Generation") - vmArgs( - "-Dfabric-api.datagen", - "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}", - "-Dfabric-api.datagen.modid=${project.extra["archives_base_name"] as String}" - ) - runDir("build/datagen") - } - } + runs { + create("datagen") { + client() + name("Data Generation") + vmArgs( + "-Dfabric-api.datagen", + "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}", + "-Dfabric-api.datagen.modid=${project.extra["archives_base_name"] as String}" + ) + runDir("build/datagen") + } + } } sourceSets { - main { - resources { - srcDirs("src/main/generated") - exclude("src/main/generated/.cache") - } - } + main { + resources { + srcDirs("src/main/generated") + exclude("src/main/generated/.cache") + } + } } fun getModVersion(): String { - val modVersion = project.property("mod_version") - val buildId = System.getenv("GITHUB_RUN_NUMBER") - - // CI builds only - if (buildId != null) { - return "${modVersion}+build.${buildId}" - } - - // If a git repo can't be found, grgit won't work, this non-null check exists so you don't run grgit stuff without a git repo - if (grgit != null) { - val head = grgit.head() - var id = head.abbreviatedId - - // Flag the build if the build tree is not clean - // (aka you have uncommitted changes) - if (!grgit.status().isClean()) { - id += "-dirty" - } - - // ex: 1.0.0+rev.91949fa or 1.0.0+rev.91949fa-dirty - return "${modVersion}+rev.${id}" - } - - // No tracking information could be found about the build - return "${modVersion}+unknown" + val modVersion = project.property("mod_version") + val buildId = System.getenv("GITHUB_RUN_NUMBER") + + // CI builds only + if (buildId != null) { + return "${modVersion}+build.${buildId}" + } + + // If a git repo can't be found, grgit won't work, this non-null check exists so you don't run grgit stuff without a git repo + if (grgit != null) { + val head = grgit.head() + var id = head.abbreviatedId + + // Flag the build if the build tree is not clean + // (aka you have uncommitted changes) + if (!grgit.status().isClean()) { + id += "-dirty" + } + + // ex: 1.0.0+rev.91949fa or 1.0.0+rev.91949fa-dirty + return "${modVersion}+rev.${id}" + } + + // No tracking information could be found about the build + return "${modVersion}+unknown" } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index edb96216..a413a1a3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,6 @@ fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-l fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" } fabric_language_kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric_language_kotlin" } -dokka_as_java = { module = "org.jetbrains.dokka:kotlin-as-java-plugin", version.ref = "dokka" } -dokka_versioning = { module = "org.jetbrains.dokka:versioning-plugin", version.ref = "dokka" } - [plugins] grgit = { id = "org.ajoberstar.grgit", version = "5.2.1"} fabric_loom = { id = "fabric-loom", version = "1.5-SNAPSHOT" }