User: kyle wood
Date: 18 Oct 22 00:03
Revision: 1b6e433603ee24b53d43cdb3780fb0bebfc427db
Summary:
Merge branch '2022.2' into 2022.3


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8175&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 4b8c24dd549a49b3fd35068bc161729e4837fab9)
+++ build.gradle.kts	(revision 1b6e433603ee24b53d43cdb3780fb0bebfc427db)
@@ -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: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision 4b8c24dd549a49b3fd35068bc161729e4837fab9)
+++ src/main/kotlin/util/utils.kt	(revision 1b6e433603ee24b53d43cdb3780fb0bebfc427db)
@@ -34,6 +34,7 @@
 import com.intellij.psi.PsiFile
 import java.util.Locale
 import kotlin.math.min
+import kotlin.reflect.KClass
 import org.jetbrains.concurrency.Promise
 import org.jetbrains.concurrency.runAsync
 
@@ -242,6 +243,7 @@
 // Using the ugly TypeToken approach we can use any complex generic signature, including
 // nested generics
 inline fun <reified T : Any> Gson.fromJson(text: String): T = fromJson(text, object : TypeToken<T>() {}.type)
+fun <T : Any> Gson.fromJson(text: String, type: KClass<T>): T = fromJson(text, type.java)
 
 fun <K> Map<K, *>.containsAllKeys(vararg keys: K) = keys.all { this.containsKey(it) }