Move all versions to version catalogs

EngineHub · Apr 29, 2024 · c9cce28 · c9cce28
1 parent e5fe510
commit c9cce28
Show file tree

Hide file tree

Showing 21 changed files with 309 additions and 180 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("net.fabricmc:fabric-loom:${versions.loom}")
+        classpath(libs.fabric.loom)
     }
 }
 plugins {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.util.Properties
-
 plugins {
     `kotlin-dsl`
 }
@@ -25,49 +23,33 @@ repositories {
         name = "Fabric"
         url = uri("https://maven.fabricmc.net/")
     }
-    maven {
-        name = "sponge"
-        url = uri("https://repo.spongepowered.org/maven")
-    }
     maven {
         name = "EngineHub Repository"
         url = uri("https://maven.enginehub.org/repo/")
     }
 }
 
-val properties = Properties().also { props ->
-    project.projectDir.resolveSibling("gradle.properties").bufferedReader().use {
-        props.load(it)
-    }
-}
-val loomVersion: String = properties.getProperty("loom.version")
-val mixinVersion: String = properties.getProperty("mixin.version")
-
 dependencies {
     implementation(gradleApi())
-    implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
-    implementation("org.ajoberstar.grgit:grgit-gradle:5.2.2")
-    implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.2")
-    implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0")
-    implementation("org.spongepowered:spongegradle-plugin-development:2.2.0")
-    implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69")
-    val neoGradleVersion = "7.0.107"
-    implementation("net.neoforged.gradle:userdev:$neoGradleVersion")
-    implementation("net.neoforged.gradle:mixin:$neoGradleVersion")
-    implementation("net.fabricmc:fabric-loom:$loomVersion")
-    implementation("net.fabricmc:sponge-mixin:$mixinVersion")
-    implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.6.0")
+    implementation(libs.licenser)
+    implementation(libs.grgit)
+    implementation(libs.japicmp)
+    implementation(libs.shadow)
+    implementation(libs.jfrog.buildinfo)
+    implementation(libs.neoGradle.userdev)
+    implementation(libs.fabric.loom)
+    implementation(libs.fabric.mixin)
+    implementation(libs.codecov)
+    implementation(libs.paperweight)
     constraints {
-        val asmVersion = "[9.7,)"
+        val asmVersion = "[${libs.versions.minimumAsm.get()},)"
         implementation("org.ow2.asm:asm:$asmVersion") {
             because("Need Java 21 support in shadow")
         }
         implementation("org.ow2.asm:asm-commons:$asmVersion") {
             because("Need Java 21 support in shadow")
         }
-        implementation("org.vafer:jdependency:[2.10,)") {
+        implementation("org.vafer:jdependency:[${libs.versions.minimumJdependency.get()},)") {
             because("Need Java 21 support in shadow")
         }
     }

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1,9 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
diff --git a/buildSrc/src/main/kotlin/AdapterConfig.kt b/buildSrc/src/main/kotlin/AdapterConfig.kt
@@ -17,7 +17,7 @@ fun Project.applyPaperweightAdapterConfiguration(javaRelease: Int = 21) {
     dependencies {
         "implementation"(project(":worldedit-bukkit"))
         constraints {
-            "remapper"("net.fabricmc:tiny-remapper:[0.8.11,)") {
+            "remapper"("net.fabricmc:tiny-remapper:[${stringyLibs.getVersion("minimumTinyRemapper")},)") {
                 because("Need remapper to support Java 21")
             }
         }

diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt
@@ -1,13 +1,13 @@
+import groovy.lang.Closure
 import org.cadixdev.gradle.licenser.LicenseExtension
 import org.gradle.api.Project
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.repositories
-import org.gradle.kotlin.dsl.the
+import org.gradle.kotlin.dsl.*
 import org.gradle.plugins.ide.idea.model.IdeaModel
+import java.util.concurrent.TimeUnit
 
 fun Project.applyCommonConfiguration() {
     group = rootProject.group
@@ -30,7 +30,7 @@ fun Project.applyCommonConfiguration() {
 
     configurations.all {
         resolutionStrategy {
-            cacheChangingModulesFor(5, "MINUTES")
+            cacheChangingModulesFor(1, TimeUnit.DAYS)
         }
     }
 
@@ -41,22 +41,23 @@ fun Project.applyCommonConfiguration() {
     }
 
     dependencies {
-        constraints {
-            for (conf in configurations) {
-                if (conf.isCanBeConsumed || conf.isCanBeResolved) {
-                    // dependencies don't get declared in these
-                    continue
-                }
-                add(conf.name, "com.google.guava:guava") {
-                    version { require(Versions.GUAVA) }
+        for (conf in listOf("implementation", "api")) {
+            if (!configurations.names.contains(conf)) {
+                continue
+            }
+            add(conf, enforcedPlatform(stringyLibs.getLibrary("log4j-bom")).map {
+                val dep = create(it)
+                dep.because("Mojang provides Log4j")
+                dep
+            })
+            constraints {
+                add(conf, stringyLibs.getLibrary("guava")) {
                     because("Mojang provides Guava")
                 }
-                add(conf.name, "com.google.code.gson:gson") {
-                    version { require(Versions.GSON) }
+                add(conf, stringyLibs.getLibrary("gson")) {
                     because("Mojang provides Gson")
                 }
-                add(conf.name, "it.unimi.dsi:fastutil") {
-                    version { require(Versions.FAST_UTIL) }
+                add(conf, stringyLibs.getLibrary("fastutil")) {
                     because("Mojang provides FastUtil")
                 }
             }

diff --git a/buildSrc/src/main/kotlin/CommonJavaConfig.kt b/buildSrc/src/main/kotlin/CommonJavaConfig.kt
@@ -43,12 +43,14 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int =
     }
 
     dependencies {
-        "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT}")
-        "testImplementation"("org.mockito:mockito-core:${Versions.MOCKITO}")
-        "testImplementation"("org.mockito:mockito-junit-jupiter:${Versions.MOCKITO}")
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
+        "compileOnly"(stringyLibs.getLibrary("jsr305"))
+        "testImplementation"(platform(stringyLibs.getLibrary("junit-bom")))
+        "testImplementation"(stringyLibs.getLibrary("junit-jupiter-api"))
+        "testImplementation"(stringyLibs.getLibrary("junit-jupiter-params"))
+        "testImplementation"(platform(stringyLibs.getLibrary("mockito-bom")))
+        "testImplementation"(stringyLibs.getLibrary("mockito-core"))
+        "testImplementation"(stringyLibs.getLibrary("mockito-junit-jupiter"))
+        "testRuntimeOnly"(stringyLibs.getLibrary("junit-jupiter-engine"))
     }
 
     // Java 8 turns on doclint which we fail

diff --git a/buildSrc/src/main/kotlin/GradleExtras.kt b/buildSrc/src/main/kotlin/GradleExtras.kt
@@ -1,6 +1,11 @@
 import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionConstraint
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.the
@@ -10,3 +15,14 @@ val Project.ext: ExtraPropertiesExtension
 
 val Project.sourceSets: SourceSetContainer
     get() = the<JavaPluginExtension>().sourceSets
+
+val Project.stringyLibs: VersionCatalog
+    get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+fun VersionCatalog.getLibrary(name: String): Provider<MinimalExternalModuleDependency> = findLibrary(name).orElseThrow {
+    error("Library $name not found in version catalog")
+}
+
+fun VersionCatalog.getVersion(name: String): VersionConstraint = findVersion(name).orElseThrow {
+    error("Version $name not found in version catalog")
+}
diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt
@@ -71,11 +71,19 @@ fun Project.applyLibrariesConfiguration() {
             .filterIsInstance<ModuleDependency>()
             .map { it.copy() }
             .map { dependency ->
-                dependency.artifact {
-                    name = dependency.name
-                    type = artifactType
-                    extension = "jar"
-                    classifier = artifactType
+                val category = dependency.attributes.getAttribute(Category.CATEGORY_ATTRIBUTE)?.name
+                if (category == Category.REGULAR_PLATFORM || category == Category.ENFORCED_PLATFORM) {
+                    return@map dependency
+                }
+                try {
+                    dependency.artifact {
+                        name = dependency.name
+                        type = artifactType
+                        extension = "jar"
+                        classifier = artifactType
+                    }
+                } catch (e: Exception) {
+                    throw RuntimeException("Failed to add artifact to dependency: $dependency", e)
                 }
                 dependency
             }

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,3 @@ version=7.3.1-SNAPSHOT
 
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
-
-loom.version=1.6.9
-mixin.version=0.13.3+mixin.0.8.5