diff --git a/api/build.gradle.kts b/api/build.gradle.kts index cbcbd95..87de06d 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -18,8 +18,8 @@ dependencies { api(platform(kotlin("bom"))) api(kotlin("stdlib")) - api("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.7.3") - api("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.6.2") + api("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.1") + api("org.jetbrains.kotlinx", "kotlinx-serialization-core", "1.7.0") } java { diff --git a/build.gradle.kts b/build.gradle.kts index 24035e3..24f0850 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.22" apply false - kotlin("kapt") version "1.9.22" apply false - kotlin("plugin.serialization") version "1.9.22" apply false + kotlin("jvm") version "1.9.24" apply false + kotlin("kapt") version "1.9.24" apply false + kotlin("plugin.serialization") version "1.9.24" apply false id("com.github.johnrengelman.shadow") version "8.1.1" apply false } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 62c9f88..fa41e02 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -19,5 +19,5 @@ apply(plugin = "kotlinx-serialization") dependencies { api(project(":unifiedmetrics-api")) - implementation("com.charleskorn.kaml:kaml:0.56.0") + implementation("com.charleskorn.kaml:kaml:0.60.0") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/platforms/bungee/build.gradle.kts b/platforms/bungee/build.gradle.kts index 7e336d0..86b0977 100644 --- a/platforms/bungee/build.gradle.kts +++ b/platforms/bungee/build.gradle.kts @@ -26,7 +26,7 @@ repositories { dependencies { api(project(":unifiedmetrics-core")) - compileOnly("net.md-5", "bungeecord-api", "1.20-R0.1") + compileOnly("net.md-5", "bungeecord-api", "1.20-R0.2") } tasks { diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index 29f29d4..bc902c1 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -16,7 +16,7 @@ */ plugins { - id("fabric-loom") version "1.4.5" + id("fabric-loom") version "1.7.1" } val transitiveInclude: Configuration by configurations.creating { @@ -29,10 +29,10 @@ dependencies { // https://fabricmc.net/versions.html minecraft("com.mojang:minecraft:1.17.1") mappings("net.fabricmc:yarn:1.17.1+build.65:v2") - modImplementation("net.fabricmc:fabric-loader:0.15.3") + modImplementation("net.fabricmc:fabric-loader:0.15.11") modImplementation("net.fabricmc.fabric-api:fabric-api:0.46.1+1.17") - modImplementation("net.fabricmc:fabric-language-kotlin:1.10.17+kotlin.1.9.22") + modImplementation("net.fabricmc:fabric-language-kotlin:1.11.0+kotlin.2.0.0") api(project(":unifiedmetrics-core"))