From 5efa03cc90f485c1e4569ec3fea3d6f2e5cc6bfc Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Sat, 6 Jan 2024 10:49:57 +0100 Subject: Build script improvements --- build.gradle | 80 ------------------------------- build.gradle.kts | 99 +++++++++++++++++++++++++++++++++++++++ gradle.properties | 14 +++--- settings.gradle | 13 ----- settings.gradle.kts | 20 ++++++++ src/main/resources/quilt.mod.json | 8 ++-- 6 files changed, 131 insertions(+), 103 deletions(-) delete mode 100644 build.gradle create mode 100644 build.gradle.kts delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 2c618b9..0000000 --- a/build.gradle +++ /dev/null @@ -1,80 +0,0 @@ -plugins { - id "maven-publish" - id "org.quiltmc.loom" version "1.4.1" -} - -base { - archivesName = modid -} - -version = "0.1+${minecraft_version}" -group = groupid - -repositories { - maven { - url "https://maven.blamejared.com" - content { - includeGroup "vazkii.patchouli" - } - } -} - -loom { - mods { - "${modid}" { - sourceSet("main") - } - } -} - -dependencies { - minecraft "com.mojang:minecraft:${minecraft_version}" - mappings loom.layered { - mappings "org.quiltmc:quilt-mappings:${minecraft_version}+build.${quilt_mappings}:intermediary-v2" - officialMojangMappings() - } - modImplementation "org.quiltmc:quilt-loader:${loader_version}" - modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}-${minecraft_version}" - - modImplementation("vazkii.patchouli:Patchouli:${patchouli_version}") { - exclude group: "net.fabricmc", module: "fabric-loader" - } - - compileOnly "jakarta.annotation:jakarta.annotation-api:${jakarta_annotation_version}" -} - -processResources { - inputs.property "version", version - - filesMatching("quilt.mod.json") { - expand "version": version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - it.options.release = 17 -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${base.archivesName.get()}" } - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - repositories {} -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6b30db9 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,99 @@ +plugins { + `maven-publish` + id("org.quiltmc.loom") +} + +val groupid: String by project +val jakartaAnnotationVersion: String by project +val loaderVersion: String by project +val modid: String by project +val minecraftVersion: String by project +val patchouliVersion: String by project +val quiltMappings: String by project +val quiltedFabricApiVersion: String by project + +base { + archivesName = modid +} + +version = "0.1+${minecraftVersion}" +group = groupid + +repositories { + maven { + url = uri("https://maven.blamejared.com") + content { + includeGroup("vazkii.patchouli") + } + } +} + +loom { + mods { + register(modid) { + sourceSet("main") + } + } +} + +dependencies { + minecraft("com.mojang:minecraft:${minecraftVersion}") + mappings(loom.layered { + mappings("org.quiltmc:quilt-mappings:${minecraftVersion}+build.${quiltMappings}:intermediary-v2") + officialMojangMappings() + }) + modImplementation("org.quiltmc:quilt-loader:${loaderVersion}") + modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quiltedFabricApiVersion}-${minecraftVersion}") + + modImplementation("vazkii.patchouli:Patchouli:${patchouliVersion}") { + exclude(group = "net.fabricmc", module = "fabric-loader") + } + + compileOnly("jakarta.annotation:jakarta.annotation-api:${jakartaAnnotationVersion}") +} + +tasks.processResources { + inputs.property("loader_version", loaderVersion) + inputs.property("minecraft_version", minecraftVersion) + inputs.property("patchouli_version", patchouliVersion) + inputs.property("quilted_fabric_api_version", quiltedFabricApiVersion) + inputs.property("version", version) + + filesMatching("quilt.mod.json") { + expand( + "loader_version" to loaderVersion, + "minecraft_version" to minecraftVersion, + "patchouli_version" to patchouliVersion, + "quilted_fabric_api_version" to quiltedFabricApiVersion, + "version" to version + ) + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + options.release = 17 +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + withSourcesJar() +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${base.archivesName.get()}" } + } +} + +publishing { + publications { + create("maven") { + from(components["java"]) + } + } + + repositories {} +} diff --git a/gradle.properties b/gradle.properties index 6dc6f57..aad323e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,13 @@ org.gradle.parallel = true groupid = lv.enes.mc modid = eris_alchemy -minecraft_version = 1.20.1 -quilt_mappings = 23 -loader_version = 0.23.0 -quilted_fabric_api_version = 7.4.0+0.90.0 +loomPluginVersion = 1.4.1 -patchouli_version = 1.20.1-84-FABRIC +minecraftVersion = 1.20.1 +quiltMappings = 23 +loaderVersion = 0.23.0 +quiltedFabricApiVersion = 7.4.0+0.90.0 -jakarta_annotation_version = 2.1.1 \ No newline at end of file +patchouliVersion = 1.20.1-84-FABRIC + +jakartaAnnotationVersion = 2.1.1 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 1496ea2..0000000 --- a/settings.gradle +++ /dev/null @@ -1,13 +0,0 @@ -pluginManagement { - repositories { - maven { - name = "Quilt" - url = "https://maven.quiltmc.org/repository/release" - } - maven { - name = "Fabric" - url = "https://maven.fabricmc.net/" - } - gradlePluginPortal() - } -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..465bf11 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,20 @@ +pluginManagement { + repositories { + maven { + name = "Quilt" + url = uri("https://maven.quiltmc.org/repository/release") + } + + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + + gradlePluginPortal() + } + + val loomPluginVersion: String by settings + plugins { + id("org.quiltmc.loom") version loomPluginVersion + } +} \ No newline at end of file diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 5b3e4e8..873c25f 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -23,17 +23,17 @@ }, "depends": [{ "id": "quilt_loader", - "versions": ">=0.23.0" + "versions": "^${loader_version}" }, { "id": "quilted_fabric_api", - "versions": ">=7.4.0" + "versions": "^${quilted_fabric_api_version}" }, { "id": "minecraft", - "versions": "1.20.1" + "versions": "=${minecraft_version}" }, { "group": "vazkii.patchouli", "id": "patchouli", - "versions": ">=1.20.1-84-FABRIC" + "versions": "^${patchouli_version}" }] }, "mixin": "eris_alchemy.mixins.json" -- cgit v1.2.3