Update gradle, kotlin, diktat, fabric-loader, the shadow plugin and the architectury-loom maximum version
This commit is contained in:
parent
4231398197
commit
9f8d48b75d
|
@ -12,18 +12,20 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "1.6.0-RC"
|
kotlin("jvm") version "1.6.10-RC"
|
||||||
kotlin("plugin.serialization") version "1.6.0-RC"
|
kotlin("plugin.serialization") version "1.6.10-RC"
|
||||||
id("com.github.johnrengelman.shadow") version "7.0.0" apply false
|
id("com.github.johnrengelman.shadow") version "7.1.0" apply false
|
||||||
id("architectury-plugin") version "[3.4.124, 3.5["
|
id("architectury-plugin") version "[3.4.124, 3.5["
|
||||||
id("dev.architectury.loom") version (
|
id("dev.architectury.loom") version (
|
||||||
if (JavaVersion.current() >= JavaVersion.VERSION_16)
|
JavaVersion.current().let { version ->
|
||||||
"[0.9.0.153, 0.10.1["
|
if (version >= JavaVersion.VERSION_16)
|
||||||
else "[0.7.3.152, 0.7.4["
|
"[0.9.0.153, ${if (version.isCompatibleWith(JavaVersion.VERSION_17)) "0.11.1" else "0.10.1"}["
|
||||||
|
else "[0.7.3.152, 0.7.3.201["
|
||||||
|
}
|
||||||
) apply false
|
) apply false
|
||||||
id("com.github.ben-manes.versions") version "0.39.0"
|
id("com.github.ben-manes.versions") version "0.39.0"
|
||||||
id("net.kyori.indra.git") version "2.0.6"
|
id("net.kyori.indra.git") version "2.0.6"
|
||||||
id("org.cqfn.diktat.diktat-gradle-plugin") version "1.0.0-rc.3"
|
id("org.cqfn.diktat.diktat-gradle-plugin") version "1.0.0"
|
||||||
id("com.modrinth.minotaur") version "1.2.1"
|
id("com.modrinth.minotaur") version "1.2.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,7 +46,7 @@ subprojects {
|
||||||
group = rootProject.group.toString()
|
group = rootProject.group.toString()
|
||||||
apply(plugin = "org.cqfn.diktat.diktat-gradle-plugin")
|
apply(plugin = "org.cqfn.diktat.diktat-gradle-plugin")
|
||||||
diktat {
|
diktat {
|
||||||
inputs = files("src/**/*.kt")
|
inputs { include("src/**/*.kt") }
|
||||||
diktatConfigFile = file("$rootDir/Formatting.yml")
|
diktatConfigFile = file("$rootDir/Formatting.yml")
|
||||||
ignoreFailures = true
|
ignoreFailures = true
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ kotlinforforge=1.12.1
|
||||||
kotlinVer=1.5.10
|
kotlinVer=1.5.10
|
||||||
kotlin_coroutines_version=1.5.0
|
kotlin_coroutines_version=1.5.0
|
||||||
serializationVer=1.2.1
|
serializationVer=1.2.1
|
||||||
fabric_loader_version=0.11.6
|
fabric_loader_version=0.12.10
|
||||||
fabric_language_kotlin=1.6.1+kotlin.1.5.10
|
fabric_language_kotlin=1.6.1+kotlin.1.5.10
|
||||||
fabric_resource_loader_version=0.2.5+059ea8667c
|
fabric_resource_loader_version=0.2.5+059ea8667c
|
||||||
fabric_rendering_api_version=1.1.2+346247d77c
|
fabric_rendering_api_version=1.1.2+346247d77c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Loading…
Reference in New Issue