diff --git a/build.gradle.kts b/build.gradle.kts index cfde82e..2191cb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,18 +12,20 @@ buildscript { } plugins { - kotlin("jvm") version "1.6.0-RC" - kotlin("plugin.serialization") version "1.6.0-RC" - id("com.github.johnrengelman.shadow") version "7.0.0" apply false + kotlin("jvm") version "1.6.10-RC" + kotlin("plugin.serialization") version "1.6.10-RC" + id("com.github.johnrengelman.shadow") version "7.1.0" apply false id("architectury-plugin") version "[3.4.124, 3.5[" id("dev.architectury.loom") version ( - if (JavaVersion.current() >= JavaVersion.VERSION_16) - "[0.9.0.153, 0.10.1[" - else "[0.7.3.152, 0.7.4[" + JavaVersion.current().let { version -> + if (version >= JavaVersion.VERSION_16) + "[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 id("com.github.ben-manes.versions") version "0.39.0" 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" } @@ -44,7 +46,7 @@ subprojects { group = rootProject.group.toString() apply(plugin = "org.cqfn.diktat.diktat-gradle-plugin") diktat { - inputs = files("src/**/*.kt") + inputs { include("src/**/*.kt") } diktatConfigFile = file("$rootDir/Formatting.yml") ignoreFailures = true } diff --git a/gradle.properties b/gradle.properties index 9115efd..35e2b83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ kotlinforforge=1.12.1 kotlinVer=1.5.10 kotlin_coroutines_version=1.5.0 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_resource_loader_version=0.2.5+059ea8667c fabric_rendering_api_version=1.1.2+346247d77c diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 345eb32..84d1f85 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists