Update Upstream

876108f Prepare for Gradle 7, but due to FG only get to 6.9
Touches #1020
This commit is contained in:
NotMyFault
2021-05-14 10:31:32 +02:00
parent be624d5fe2
commit 9aa25ce109
4 changed files with 15 additions and 16 deletions

View File

@ -22,9 +22,6 @@ val properties = Properties().also { props ->
dependencies {
implementation(gradleApi())
implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.5.0")
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
}

View File

@ -56,16 +56,20 @@ fun Project.applyCommonConfiguration() {
dependencies {
constraints {
for (conf in configurations.names) {
add(conf, "com.google.guava:guava") {
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 { strictly(Versions.GUAVA) }
because("Mojang provides Guava")
}
add(conf, "com.google.code.gson:gson") {
add(conf.name, "com.google.code.gson:gson") {
version { strictly(Versions.GSON) }
because("Mojang provides Gson")
}
add(conf, "it.unimi.dsi:fastutil") {
add(conf.name, "it.unimi.dsi:fastutil") {
version { strictly(Versions.FAST_UTIL) }
because("Mojang provides FastUtil")
}