begin pulling versions into buildSrc/Versions

This commit is contained in:
dfsek
2021-12-19 14:56:52 -07:00
parent fb1ebd0e11
commit 626c65fc3e
8 changed files with 49 additions and 17 deletions
@@ -0,0 +1,23 @@
package com.dfsek.terra
object Versions {
object Libraries {
const val tectonic = "3.1.0"
const val cloud = "1.6.1"
const val slf4j = "1.7.32"
const val log4j_slf4j_impl = "2.14.1"
}
object Fabric {
const val fabricAPI = "0.44.0+1.18"
const val minecraft = "1.18.1"
const val yarn = "$minecraft+build.7"
}
object Bukkit {
const val paper = "1.18-R0.1-SNAPSHOT"
const val paperLib = "1.0.5"
}
}
+2 -1
View File
@@ -1,8 +1,9 @@
import com.dfsek.terra.Versions
import com.dfsek.terra.version import com.dfsek.terra.version
version = version("0.1.0") version = version("0.1.0")
dependencies { dependencies {
shadedImplementation("com.dfsek.tectonic:yaml:3.1.0") shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
shadedApi(project(":common:addons:manifest-addon-loader")) shadedApi(project(":common:addons:manifest-addon-loader"))
} }
@@ -1,10 +1,11 @@
import com.dfsek.terra.Versions
import com.dfsek.terra.version import com.dfsek.terra.version
version = version("0.1.0") version = version("0.1.0")
dependencies { dependencies {
shadedApi("commons-io:commons-io:2.6") shadedApi("commons-io:commons-io:2.6")
shadedImplementation("com.dfsek.tectonic:yaml:3.1.0") shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
} }
tasks.withType<Jar> { tasks.withType<Jar> {
+3 -1
View File
@@ -1,3 +1,5 @@
import com.dfsek.terra.Versions
dependencies { dependencies {
shadedApi(project(":common:api:util")) shadedApi(project(":common:api:util"))
shadedApi(project(":common:api:noise")) shadedApi(project(":common:api:noise"))
@@ -6,7 +8,7 @@ dependencies {
shadedApi("net.jafama:jafama:2.3.2") shadedApi("net.jafama:jafama:2.3.2")
shadedApi("org.slf4j:slf4j-api:1.7.32") shadedApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
shadedApi("cloud.commandframework", "cloud-core", "1.6.1") shadedApi("cloud.commandframework", "cloud-core", "1.6.1")
} }
+3 -1
View File
@@ -1,5 +1,7 @@
import com.dfsek.terra.Versions
dependencies { dependencies {
shadedApi("com.dfsek.tectonic:common:3.1.0") shadedApi("com.dfsek.tectonic:common:${Versions.Libraries.tectonic}")
shadedApi("net.jafama:jafama:2.3.2") shadedApi("net.jafama:jafama:2.3.2")
} }
+3 -1
View File
@@ -1,3 +1,5 @@
import com.dfsek.terra.Versions
dependencies { dependencies {
shadedApi(project(":common:api")) shadedApi(project(":common:api"))
shadedApi(project(":common:implementation:bootstrap-addon-loader")) shadedApi(project(":common:implementation:bootstrap-addon-loader"))
@@ -6,7 +8,7 @@ dependencies {
shadedApi("commons-io:commons-io:2.6") shadedApi("commons-io:commons-io:2.6")
shadedImplementation("org.apache.commons:commons-text:1.9") shadedImplementation("org.apache.commons:commons-text:1.9")
shadedImplementation("com.dfsek.tectonic:yaml:3.1.0") shadedImplementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
shadedImplementation("org.yaml:snakeyaml:1.27") shadedImplementation("org.yaml:snakeyaml:1.27")
shadedImplementation("org.ow2.asm:asm:9.2") shadedImplementation("org.ow2.asm:asm:9.2")
+4 -3
View File
@@ -1,4 +1,5 @@
import com.dfsek.terra.addonDir import com.dfsek.terra.addonDir
import com.dfsek.terra.Versions
import com.dfsek.terra.gitClone import com.dfsek.terra.gitClone
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import java.net.URL import java.net.URL
@@ -25,12 +26,12 @@ dependencies {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
} }
compileOnly("io.papermc.paper:paper-api:1.18-R0.1-SNAPSHOT") compileOnly("io.papermc.paper", "paper-api", Versions.Bukkit.paper)
shadedImplementation("io.papermc:paperlib:1.0.5") shadedImplementation("io.papermc", "paperlib", Versions.Bukkit.paperLib)
shadedApi("com.google.guava:guava:30.0-jre") shadedApi("com.google.guava:guava:30.0-jre")
shadedApi("cloud.commandframework", "cloud-paper", "1.6.1") shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
} }
val jvmFlags = listOf( val jvmFlags = listOf(
+9 -9
View File
@@ -1,9 +1,9 @@
import com.dfsek.terra.addonDir import com.dfsek.terra.addonDir
import com.dfsek.terra.Versions
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.modrinth.minotaur.TaskModrinthUpload import com.modrinth.minotaur.TaskModrinthUpload
import net.fabricmc.loom.task.RemapJarTask import net.fabricmc.loom.task.RemapJarTask
val minecraft = "1.18.1"
val yarn = "6" val yarn = "6"
val fabricLoader = "0.12.12" val fabricLoader = "0.12.12"
@@ -16,27 +16,27 @@ plugins {
dependencies { dependencies {
shadedApi(project(":common:implementation:base")) shadedApi(project(":common:implementation:base"))
shadedApi("org.slf4j:slf4j-api:1.7.32") { shadedApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j) {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.") because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.")
} }
shaded("org.apache.logging.log4j:log4j-slf4j-impl:2.14.1") { shaded("org.apache.logging.log4j", "log4j-slf4j-impl", Versions.Libraries.log4j_slf4j_impl) {
because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.") because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, but we want slf4j 1.7.")
exclude("org.apache.logging.log4j") exclude("org.apache.logging.log4j")
} }
minecraft("com.mojang:minecraft:$minecraft") { minecraft("com.mojang:minecraft:${Versions.Fabric.minecraft}") {
exclude("org.slf4j") exclude("org.slf4j")
} }
mappings("net.fabricmc:yarn:$minecraft+build.$yarn:v2") mappings("net.fabricmc:yarn:${Versions.Fabric.yarn}:v2")
modImplementation("net.fabricmc:fabric-loader:$fabricLoader") modImplementation("net.fabricmc:fabric-loader:$fabricLoader")
setOf("fabric-command-api-v1", "fabric-lifecycle-events-v1").forEach { apiModule -> setOf("fabric-command-api-v1", "fabric-lifecycle-events-v1").forEach { apiModule ->
modImplementation(fabricApi.module(apiModule, "0.44.0+1.18"))?.let { include(it) } modImplementation(fabricApi.module(apiModule, Versions.Fabric.fabricAPI))?.let { include(it) }
} }
modImplementation("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")?.let { include(it) } modImplementation(include("me.lucko", "fabric-permissions-api", "0.1-SNAPSHOT"))
modImplementation("cloud.commandframework:cloud-fabric:1.6.1")?.let { include(it) } modImplementation(include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud))
} }
loom { loom {
@@ -76,6 +76,6 @@ tasks.register<TaskModrinthUpload>("publishModrinth") {
versionNumber = "${project.version}-fabric" versionNumber = "${project.version}-fabric"
uploadFile = remapped.get().archiveFile.get().asFile uploadFile = remapped.get().archiveFile.get().asFile
releaseType = "beta" releaseType = "beta"
addGameVersion(minecraft) addGameVersion(Versions.Fabric.minecraft)
addLoader("fabric") addLoader("fabric")
} }