mirror of
https://github.com/EngineHub/WorldEdit.git
synced 2025-01-30 12:51:17 +08:00
Fix misalignment of libs dependencies
This commit is contained in:
parent
4bbdc059ed
commit
f51fb1cd88
@ -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")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -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}")
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
applyLibrariesConfiguration()
|
applyLibrariesConfiguration()
|
||||||
|
constrainDependenciesToLibsCore()
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
@ -8,4 +9,4 @@
|
|||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
"shade"("net.kyori:text-adapter-spongeapi:${Versions.TEXT_EXTRAS}")
|
"shade"("net.kyori:text-adapter-spongeapi:${Versions.TEXT_EXTRAS}")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user