Fix misalignment of libs dependencies

This commit is contained in:
Octavia Togami 2020-03-25 00:51:56 -07:00
parent 4bbdc059ed
commit f51fb1cd88
No known key found for this signature in database
GPG Key ID: CC364524D1983C99
3 changed files with 20 additions and 2 deletions

View File

@ -1,11 +1,13 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.ExternalModuleDependency
import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.ModuleDependency
import org.gradle.api.internal.HasConvention import org.gradle.api.internal.HasConvention
import org.gradle.api.plugins.MavenRepositoryHandlerConvention import org.gradle.api.plugins.MavenRepositoryHandlerConvention
import org.gradle.api.tasks.Upload import org.gradle.api.tasks.Upload
import org.gradle.api.tasks.bundling.Jar import org.gradle.api.tasks.bundling.Jar
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.getPlugin import org.gradle.kotlin.dsl.getPlugin
import org.gradle.kotlin.dsl.invoke import org.gradle.kotlin.dsl.invoke
@ -106,3 +108,16 @@
applyCommonArtifactoryConfig() applyCommonArtifactoryConfig()
} }
fun Project.constrainDependenciesToLibsCore() {
evaluationDependsOn(":worldedit-libs:core")
val coreDeps = project(":worldedit-libs:core").configurations["shade"].dependencies
.filterIsInstance<ExternalModuleDependency>()
dependencies.constraints {
for (coreDep in coreDeps) {
add("shade", "${coreDep.group}:${coreDep.name}:${coreDep.version}") {
because("libs should align with libs:core")
}
}
}
}

View File

@ -1,4 +1,5 @@
applyLibrariesConfiguration() applyLibrariesConfiguration()
constrainDependenciesToLibsCore()
repositories { repositories {
maven { maven {
@ -6,6 +7,7 @@
url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
} }
} }
dependencies { dependencies {
"shade"("net.kyori:text-adapter-bukkit:${Versions.TEXT_EXTRAS}") "shade"("net.kyori:text-adapter-bukkit:${Versions.TEXT_EXTRAS}")
} }

View File

@ -1,4 +1,5 @@
applyLibrariesConfiguration() applyLibrariesConfiguration()
constrainDependenciesToLibsCore()
repositories { repositories {
maven { maven {