diff --git a/Jankson b/Jankson index 8771387..9504df0 160000 --- a/Jankson +++ b/Jankson @@ -1 +1 @@ -Subproject commit 8771387a0568da140879c0104da32ba58e3bb717 +Subproject commit 9504df0618d2826aefd98db80445d5d68484b606 diff --git a/build.gradle b/build.gradle index ff987ae..84632ce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.jetbrains.kotlin.jvm" version '1.2.41' + id "org.jetbrains.kotlin.jvm" version '1.2.51' id 'idea' } @@ -29,11 +29,6 @@ subprojects { name = "shadowfacts" url = "http://maven.shadowfacts.net/" } - ivy { - //Resolves jankson - name "endless.blue dependency mirror"; - artifactPattern "https://endless.blue/files/ivy/[module]-[revision].[ext]"; - } } } \ No newline at end of file diff --git a/core/src/main/kotlin/matterlink/config/CommandConfig.kt b/core/src/main/kotlin/matterlink/config/CommandConfig.kt index a7993c4..79499dd 100644 --- a/core/src/main/kotlin/matterlink/config/CommandConfig.kt +++ b/core/src/main/kotlin/matterlink/config/CommandConfig.kt @@ -96,8 +96,8 @@ object CommandConfig { } .build() - jankson.marshaller.registerSerializer(Regex::class.java) { - JsonPrimitive(it.pattern) + jankson.marshaller.registerSerializer(Regex::class.java) { regex, marshaller -> + JsonPrimitive(regex.pattern) } val jsonObject = try {