User: kyle wood Date: 18 Oct 22 00:01 Revision: 9348f4089f9d692e6028fed784b350a4e2d019c8 Summary: Merge branch '2021.2' into 2021.3 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8169&personal=false Index: build.gradle.kts =================================================================== --- build.gradle.kts (revision 4471893ae7362b4131bae0eafd2e80c1de986159) +++ build.gradle.kts (revision 9348f4089f9d692e6028fed784b350a4e2d019c8) @@ -17,7 +17,7 @@ import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask plugins { - kotlin("jvm") version "1.7.10" + kotlin("jvm") version "1.7.20" java mcdev groovy @@ -85,6 +85,8 @@ implementation(libs.mappingIo) implementation(libs.bundles.asm) + implementation(libs.bundles.fuel) + jflex(libs.jflex.lib) jflexSkeleton(libs.jflex.skeleton) { artifact { Index: gradle/libs.versions.toml =================================================================== --- gradle/libs.versions.toml (revision 4471893ae7362b4131bae0eafd2e80c1de986159) +++ gradle/libs.versions.toml (revision 9348f4089f9d692e6028fed784b350a4e2d019c8) @@ -1,8 +1,9 @@ [versions] -coroutines = "1.6.3" +coroutines = "1.6.4" junit = "5.9.0" junit-platform = "1.9.0" asm = "9.3" +fuel = "2.3.1" [libraries] coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } @@ -26,6 +27,9 @@ asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" } asm-analysis = { module = "org.ow2.asm:asm-analysis", version.ref = "asm" } +fuel = { module = "com.github.kittinunf.fuel:fuel", version.ref = "fuel" } +fuel-coroutines = { module = "com.github.kittinunf.fuel:fuel-coroutines", version.ref = "fuel" } + # Testing test-mockJdk = "org.jetbrains.idea:mock-jdk:1.7-4d76c50" test-mixin = "org.spongepowered:mixin:0.8.5" @@ -39,3 +43,4 @@ [bundles] coroutines = ["coroutines-core", "coroutines-jdk8", "coroutines-swing"] asm = ["asm", "asm-tree", "asm-analysis"] +fuel = ["fuel", "fuel-coroutines"]