sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update jankson

This commit is contained in:
nikky 2018-07-03 23:49:25 +02:00
parent 510123b6f5
commit c326ca2b48
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jankson

@ -1 +1 @@
Subproject commit 8771387a0568da140879c0104da32ba58e3bb717 Subproject commit 9504df0618d2826aefd98db80445d5d68484b606

7
build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id "org.jetbrains.kotlin.jvm" version '1.2.41' id "org.jetbrains.kotlin.jvm" version '1.2.51'
id 'idea' id 'idea'
} }
@ -29,11 +29,6 @@ subprojects {
name = "shadowfacts" name = "shadowfacts"
url = "http://maven.shadowfacts.net/" url = "http://maven.shadowfacts.net/"
} }
ivy {
//Resolves jankson
name "endless.blue dependency mirror";
artifactPattern "https://endless.blue/files/ivy/[module]-[revision].[ext]";
}
} }
} }

4
core/src/main/kotlin/matterlink/config/CommandConfig.kt
View File

@ -96,8 +96,8 @@ object CommandConfig {
} }
.build() .build()
jankson.marshaller.registerSerializer(Regex::class.java) { jankson.marshaller.registerSerializer(Regex::class.java) { regex, marshaller ->
JsonPrimitive(it.pattern) JsonPrimitive(regex.pattern)
} }
val jsonObject = try { val jsonObject = try {